Revision 261
stuff
proj.c | ||
---|---|---|
52 | 52 |
int(proj_main_loop)(int argc, char *argv[]) { |
53 | 53 |
|
54 | 54 |
int r; |
55 |
#ifndef DIOGO |
|
56 |
font_t *consolas = font_ctor("/home/lcom/labs/proj/media/font/Consolas/xpm2"); |
|
57 |
if(consolas == NULL){ printf("Failed to load consolas\n"); return 1; } |
|
58 | 55 |
|
59 |
/// subscribe interrupts
|
|
60 |
if (subscribe_all()) { return 1; }
|
|
56 |
font_t *consolas = font_ctor("/home/lcom/labs/proj/media/font/Consolas/xpm2");
|
|
57 |
if(consolas == NULL){ printf("Failed to load consolas\n"); return 1; }
|
|
61 | 58 |
|
62 |
/// initialize graphics |
|
63 |
if(graph_init(GRAPH_MODE)){ |
|
64 |
printf("%s: failed to initalize graphics.\n", __func__); |
|
65 |
if (cleanup()) printf("%s: failed to cleanup.\n", __func__); |
|
66 |
return 1; |
|
67 |
} |
|
59 |
/// subscribe interrupts |
|
60 |
if (subscribe_all()) { return 1; } |
|
68 | 61 |
|
69 |
/// Load stuff |
|
70 |
basic_sprite_t *bsp_crosshair = NULL; |
|
71 |
basic_sprite_t *bsp_shooter = NULL; |
|
72 |
basic_sprite_t *bsp_pistol = NULL; |
|
73 |
basic_sprite_t *bsp_nothing = NULL; |
|
74 |
basic_sprite_t *bsp_bullet = NULL; |
|
75 |
map_t *map1 = NULL; |
|
76 |
sprite_t *sp_crosshair = NULL; |
|
77 |
{ |
|
78 |
graph_clear_screen(); |
|
79 |
text_t *txt = text_ctor(consolas, "Loading..."); |
|
80 |
text_draw(txt); |
|
81 |
text_dtor(txt); |
|
82 |
graph_draw(); |
|
62 |
/// initialize graphics |
|
63 |
if(graph_init(GRAPH_MODE)){ |
|
64 |
printf("%s: failed to initalize graphics.\n", __func__); |
|
65 |
if (cleanup()) printf("%s: failed to cleanup.\n", __func__); |
|
66 |
return 1; |
|
67 |
} |
|
83 | 68 |
|
84 |
bsp_crosshair = get_crosshair(); if(bsp_crosshair == NULL) printf("Failed to get crosshair\n"); |
|
85 |
bsp_shooter = get_shooter (); if(bsp_shooter == NULL) printf("Failed to get shooter\n"); |
|
86 |
bsp_pistol = get_pistol (); if(bsp_pistol == NULL) printf("Failed to get pistol\n"); |
|
87 |
bsp_nothing = get_nothing (); if(bsp_nothing == NULL) printf("Failed to get nothing\n"); |
|
88 |
bsp_bullet = get_bullet (); if(bsp_bullet == NULL) printf("Failed to get bullet\n"); |
|
89 |
map1 = get_map1 (); if(map1 == NULL) printf("Failed to get map1\n"); |
|
90 |
|
|
91 |
sp_crosshair = sprite_ctor(bsp_crosshair); if(sp_crosshair == NULL) printf("Failed to get crosshair sprite\n"); |
|
92 |
} |
|
93 |
#endif |
|
94 |
|
|
95 |
#ifdef DIOGO |
|
96 |
/* |
|
69 |
/// Load stuff |
|
70 |
basic_sprite_t *bsp_crosshair = NULL; |
|
71 |
basic_sprite_t *bsp_shooter = NULL; |
|
72 |
basic_sprite_t *bsp_pistol = NULL; |
|
73 |
basic_sprite_t *bsp_nothing = NULL; |
|
74 |
basic_sprite_t *bsp_bullet = NULL; |
|
75 |
map_t *map1 = NULL; |
|
76 |
sprite_t *sp_crosshair = NULL; |
|
77 |
{ |
|
97 | 78 |
graph_clear_screen(); |
98 |
|
|
99 |
rectangle_t *rect = rectangle_ctor(0,0,400,100); |
|
100 |
rectangle_set_pos(rect, |
|
101 |
graph_get_XRes()/2 - rectangle_get_w(rect)/2, |
|
102 |
graph_get_YRes()*0.25 - rectangle_get_h(rect)/2); |
|
103 |
rectangle_set_fill_color(rect, BLACK); |
|
104 |
rectangle_set_outline_width(rect, 2); |
|
105 |
rectangle_set_outline_color(rect, WHITE); |
|
106 |
rectangle_draw(rect); |
|
107 |
|
|
108 |
text_t *txt = text_ctor(consolas, "Hello world!"); |
|
109 |
text_set_color(txt, 0x888888); |
|
110 |
|
|
111 |
text_set_pos(txt, rectangle_get_x(rect)+rectangle_get_w(rect)/2, |
|
112 |
rectangle_get_y(rect)+rectangle_get_h(rect)/2); |
|
113 |
text_set_valign(txt, text_valign_center); |
|
114 |
text_set_halign(txt, text_halign_center); |
|
79 |
text_t *txt = text_ctor(consolas, "Loading..."); |
|
115 | 80 |
text_draw(txt); |
116 | 81 |
text_dtor(txt); |
117 |
|
|
118 | 82 |
graph_draw(); |
119 |
rectangle_dtor(rect); |
|
120 | 83 |
|
121 |
list_t *l = list_ctor(); |
|
122 |
int *p = NULL; |
|
123 |
for(int i = 10; i < 20; ++i){ |
|
124 |
p = malloc(sizeof(int)); |
|
125 |
*p = i; |
|
126 |
printf("INSERTING %d\n", i); |
|
127 |
list_insert(l, list_end(l), p); |
|
128 |
printf("INSERTED, SIZE=%d\n", list_size(l)); |
|
129 |
} |
|
130 |
list_node_t *it = list_begin(l); |
|
131 |
while(it != list_end(l)){ |
|
132 |
printf("%d\n", **(int**)list_node_val(it)); |
|
133 |
it = list_node_next(it); |
|
134 |
} |
|
135 |
while(list_size(l) > 0){ |
|
136 |
printf("ERASING\n"); |
|
137 |
void *p = list_erase(l, list_begin(l)); |
|
138 |
printf("ERASED %d, SIZE=%d\n", *(int*)p, list_size(l)); |
|
139 |
free(p); |
|
140 |
} |
|
141 |
printf("DONE\n"); |
|
142 |
if(list_dtor(l)) printf("COULD NOT DESTRUCT LIST\n"); |
|
84 |
bsp_crosshair = get_crosshair(); if(bsp_crosshair == NULL) printf("Failed to get crosshair\n"); |
|
85 |
bsp_shooter = get_shooter (); if(bsp_shooter == NULL) printf("Failed to get shooter\n"); |
|
86 |
bsp_pistol = get_pistol (); if(bsp_pistol == NULL) printf("Failed to get pistol\n"); |
|
87 |
bsp_nothing = get_nothing (); if(bsp_nothing == NULL) printf("Failed to get nothing\n"); |
|
88 |
bsp_bullet = get_bullet (); if(bsp_bullet == NULL) printf("Failed to get bullet\n"); |
|
89 |
map1 = get_map1 (); if(map1 == NULL) printf("Failed to get map1\n"); |
|
143 | 90 |
|
91 |
sp_crosshair = sprite_ctor(bsp_crosshair); if(sp_crosshair == NULL) printf("Failed to get crosshair sprite\n"); |
|
92 |
} |
|
144 | 93 |
|
145 |
tickdelay(micros_to_ticks(1000000));*/
|
|
94 |
ent_set_scale(DEFAULT_SCALE);
|
|
146 | 95 |
|
147 |
// RTC |
|
148 |
/* |
|
149 |
uint8_t date[4], time[3]; |
|
96 |
text_timer_t *in_game_timer = timer_ctor(consolas); |
|
150 | 97 |
|
151 |
if (rtc_read_time(time)) return 1;
|
|
98 |
menu_t *main_menu = menu_ctor(consolas);
|
|
152 | 99 |
|
153 |
if (rtc_read_date(date)) return 1;
|
|
100 |
list_t *shooter_list = list_ctor();
|
|
154 | 101 |
|
155 |
printf("Hour: %02d:%02d:%02d\n", time[2], time[1], time[0]); |
|
102 |
gunner_t *shooter1 = gunner_ctor(bsp_shooter, bsp_pistol); if(shooter1 == NULL) printf("Failed to get shooter1\n"); |
|
103 |
gunner_set_spawn(shooter1, 75, 75); |
|
104 |
gunner_set_pos(shooter1, 75, 75); |
|
156 | 105 |
|
157 |
printf("Date: %d, %02d/%02d/%02d\n", date[0], date[1], date[2], date[3]); |
|
158 |
*/ |
|
159 |
//UART |
|
160 |
unsigned long bits = 8; |
|
161 |
unsigned long stop = 2; |
|
162 |
long parity = 0; |
|
163 |
unsigned long rate = 9600; |
|
164 |
unsigned char tx = 0; (void)tx; |
|
165 |
int stringc = 2; (void)stringc; |
|
166 |
char *strings[] = {"Hello", "world"}; (void)strings; |
|
167 |
//if((r = ser_test_set(COM1_ADDR, bits, stop, parity, rate))) return r; |
|
168 |
//if((r = ser_test_conf(COM1_ADDR))) return r; |
|
169 |
if((r = ser_test_poll(COM1_ADDR, tx, bits, stop, parity, rate, stringc, strings))) return r; |
|
170 |
printf("DONE\n"); |
|
171 |
#endif |
|
172 |
#ifndef DIOGO |
|
173 |
ent_set_scale(DEFAULT_SCALE); |
|
106 |
gunner_t *shooter2 = gunner_ctor(bsp_shooter, bsp_nothing); |
|
107 |
gunner_set_spawn(shooter2, 975, 75); |
|
108 |
gunner_set_pos(shooter2, 775, 75); |
|
174 | 109 |
|
175 |
text_timer_t *in_game_timer = timer_ctor(consolas); |
|
110 |
list_insert(shooter_list, list_end(shooter_list), shooter1); |
|
111 |
list_insert(shooter_list, list_end(shooter_list), shooter2); |
|
176 | 112 |
|
177 |
menu_t *main_menu = menu_ctor(consolas);
|
|
113 |
list_t *bullet_list = list_ctor();
|
|
178 | 114 |
|
179 |
list_t *shooter_list = list_ctor(); |
|
115 |
ent_set_origin(gunner_get_x(shooter1)-ent_get_XLength()/2.0, |
|
116 |
gunner_get_y(shooter1)-ent_get_YLength()/2.0); |
|
180 | 117 |
|
181 |
gunner_t *shooter1 = gunner_ctor(bsp_shooter, bsp_pistol); if(shooter1 == NULL) printf("Failed to get shooter1\n"); |
|
182 |
gunner_set_spawn(shooter1, 75, 75); |
|
183 |
gunner_set_pos(shooter1, 75, 75); |
|
118 |
//uint32_t refresh_count_value = sys_hz() / REFRESH_RATE; |
|
119 |
double angle; // mouse angle |
|
120 |
int32_t *mouse_x = get_mouse_X(), *mouse_y = get_mouse_Y(); |
|
121 |
uint8_t last_lb = 0; |
|
122 |
struct packet pp; |
|
123 |
keys_t *keys = get_key_presses(); |
|
124 |
/// loop stuff |
|
125 |
int ipc_status; |
|
126 |
message msg; |
|
127 |
int game_state = MENU, click = 0; (void)click; |
|
184 | 128 |
|
185 |
gunner_t *shooter2 = gunner_ctor(bsp_shooter, bsp_nothing); |
|
186 |
gunner_set_spawn(shooter2, 975, 75); |
|
187 |
gunner_set_pos(shooter2, 775, 75); |
|
129 |
while (game_state != EXIT) { |
|
130 |
/* Get a request message. */ |
|
131 |
if ((r = driver_receive(ANY, &msg, &ipc_status)) != 0) { |
|
132 |
printf("driver_receive failed with %d", r); |
|
133 |
continue; |
|
134 |
} |
|
135 |
if (is_ipc_notify(ipc_status)) { /* received notification */ |
|
136 |
switch (_ENDPOINT_P(msg.m_source)) { |
|
137 |
case HARDWARE: /* hardware interrupt notification */ |
|
138 |
for (uint32_t i = 0, n = 1; i < 32; i++, n <<= 1) { |
|
139 |
if (msg.m_notify.interrupts & n) { |
|
140 |
interrupt_handler(i); |
|
141 |
switch (i) { |
|
142 |
#ifndef DIOGO |
|
143 |
case TIMER0_IRQ: |
|
144 |
switch (game_state) { |
|
145 |
case MENU: |
|
146 |
if (no_interrupts % 2 == 0){ |
|
147 |
graph_clear_screen(); |
|
148 |
game_state = menu_update_state(main_menu, click); |
|
149 |
menu_draw(main_menu); |
|
188 | 150 |
|
189 |
list_insert(shooter_list, list_end(shooter_list), shooter1); |
|
190 |
list_insert(shooter_list, list_end(shooter_list), shooter2); |
|
151 |
click = 0; |
|
191 | 152 |
|
192 |
list_t *bullet_list = list_ctor(); |
|
153 |
sprite_set_pos(sp_crosshair, *mouse_x, *mouse_y); |
|
154 |
sprite_draw(sp_crosshair); |
|
155 |
graph_draw(); |
|
156 |
} |
|
157 |
break; |
|
158 |
case GAME: |
|
159 |
if (no_interrupts % 60 == 0) timer_update(in_game_timer); |
|
160 |
update_movement(map1, shooter1, keys, shooter_list); |
|
193 | 161 |
|
194 |
ent_set_origin(gunner_get_x(shooter1)-ent_get_XLength()/2.0, |
|
195 |
gunner_get_y(shooter1)-ent_get_YLength()/2.0); |
|
162 |
update_game_state(map1, shooter_list, bullet_list); |
|
196 | 163 |
|
197 |
//uint32_t refresh_count_value = sys_hz() / REFRESH_RATE; |
|
198 |
double angle; // mouse angle |
|
199 |
int32_t *mouse_x = get_mouse_X(), *mouse_y = get_mouse_Y(); |
|
200 |
uint8_t last_lb = 0; |
|
201 |
struct packet pp; |
|
202 |
keys_t *keys = get_key_presses(); |
|
164 |
//update_scale(); |
|
165 |
angle = get_mouse_angle(shooter1); |
|
166 |
gunner_set_angle(shooter1, angle - M_PI_2); |
|
203 | 167 |
|
204 |
/// loop stuff |
|
205 |
int ipc_status; |
|
206 |
message msg; |
|
207 |
int game_state = MENU, click = 0; |
|
168 |
ent_set_origin(gunner_get_x(shooter1)-ent_get_XLength()/2.0, |
|
169 |
gunner_get_y(shooter1)-ent_get_YLength()/2.0); |
|
208 | 170 |
|
209 |
while (game_state != EXIT) { |
|
210 |
/* Get a request message. */ |
|
211 |
if ((r = driver_receive(ANY, &msg, &ipc_status)) != 0) { |
|
212 |
printf("driver_receive failed with %d", r); |
|
213 |
continue; |
|
214 |
} |
|
215 |
if (is_ipc_notify(ipc_status)) { /* received notification */ |
|
216 |
switch (_ENDPOINT_P(msg.m_source)) { |
|
217 |
case HARDWARE: /* hardware interrupt notification */ |
|
218 |
for (uint32_t i = 0, n = 1; i < 32; i++, n <<= 1) { |
|
219 |
if (msg.m_notify.interrupts & n) { |
|
220 |
interrupt_handler(i); |
|
221 |
switch (i) { |
|
222 |
case TIMER0_IRQ: |
|
223 |
switch (game_state) { |
|
224 |
case MENU: |
|
225 |
if (no_interrupts % 2 == 0){ |
|
226 |
graph_clear_screen(); |
|
227 |
game_state = menu_update_state(main_menu, click); |
|
228 |
menu_draw(main_menu); |
|
171 |
graph_clear_screen(); |
|
172 |
map_draw (map1); |
|
173 |
gunner_draw_list(shooter_list); |
|
174 |
bullet_draw_list(bullet_list); |
|
229 | 175 |
|
230 |
click = 0;
|
|
176 |
text_draw(in_game_timer->text);
|
|
231 | 177 |
|
232 |
sprite_set_pos(sp_crosshair, *mouse_x, *mouse_y); |
|
233 |
sprite_draw(sp_crosshair); |
|
234 |
graph_draw(); |
|
178 |
sprite_set_pos(sp_crosshair, *mouse_x, *mouse_y); |
|
179 |
sprite_draw(sp_crosshair); |
|
180 |
graph_draw(); |
|
181 |
break; |
|
182 |
} |
|
183 |
break; |
|
184 |
case KBC_IRQ: |
|
185 |
switch (game_state) { |
|
186 |
case MENU: |
|
187 |
if ((scancode[0]) == ESC_BREAK_CODE) game_state = EXIT; |
|
188 |
break; |
|
189 |
case GAME: |
|
190 |
if ((scancode[0]) == ESC_BREAK_CODE) { |
|
191 |
game_state = MENU; |
|
192 |
// reset game |
|
193 |
while(list_size(bullet_list) > 0){ |
|
194 |
bullet_t *p = (bullet_t*)list_erase(bullet_list, list_begin(bullet_list)); |
|
195 |
bullet_dtor(p); |
|
235 | 196 |
} |
236 |
break; |
|
237 |
case GAME: |
|
238 |
if (no_interrupts % 60 == 0) timer_update(in_game_timer); |
|
239 |
update_movement(map1, shooter1, keys, shooter_list); |
|
240 |
|
|
241 |
update_game_state(map1, shooter_list, bullet_list); |
|
242 |
|
|
243 |
//update_scale(); |
|
244 |
angle = get_mouse_angle(shooter1); |
|
245 |
gunner_set_angle(shooter1, angle - M_PI_2); |
|
246 |
|
|
247 |
ent_set_origin(gunner_get_x(shooter1)-ent_get_XLength()/2.0, |
|
248 |
gunner_get_y(shooter1)-ent_get_YLength()/2.0); |
|
249 |
|
|
250 |
graph_clear_screen(); |
|
251 |
map_draw (map1); |
|
252 |
gunner_draw_list(shooter_list); |
|
253 |
bullet_draw_list(bullet_list); |
|
254 |
|
|
255 |
text_draw(in_game_timer->text); |
|
256 |
|
|
257 |
sprite_set_pos(sp_crosshair, *mouse_x, *mouse_y); |
|
258 |
sprite_draw(sp_crosshair); |
|
259 |
graph_draw(); |
|
260 |
break; |
|
197 |
list_node_t *it = list_begin(shooter_list); |
|
198 |
while (it != list_end(shooter_list)) { |
|
199 |
gunner_t *p = *(gunner_t**)list_node_val(it); |
|
200 |
get_random_spawn(map1, p); |
|
201 |
gunner_set_curr_health(p, gunner_get_health(p)); |
|
202 |
it = list_node_next(it); |
|
203 |
} |
|
204 |
timer_reset(in_game_timer); |
|
261 | 205 |
} |
262 | 206 |
break; |
263 |
case KBC_IRQ: |
|
207 |
} |
|
208 |
break; |
|
209 |
case MOUSE_IRQ: |
|
210 |
if (counter_mouse_ih >= 3) { |
|
211 |
mouse_parse_packet(packet_mouse_ih, &pp); |
|
212 |
update_mouse(&pp); |
|
264 | 213 |
switch (game_state) { |
265 | 214 |
case MENU: |
266 |
if ((scancode[0]) == ESC_BREAK_CODE) game_state = EXIT;
|
|
215 |
if (!click) click = last_lb ^ keys->lb_pressed && keys->lb_pressed;
|
|
267 | 216 |
break; |
268 | 217 |
case GAME: |
269 |
if ((scancode[0]) == ESC_BREAK_CODE) { |
|
270 |
game_state = MENU; |
|
271 |
// reset game |
|
272 |
while(list_size(bullet_list) > 0){ |
|
273 |
bullet_t *p = (bullet_t*)list_erase(bullet_list, list_begin(bullet_list)); |
|
274 |
bullet_dtor(p); |
|
275 |
} |
|
276 |
list_node_t *it = list_begin(shooter_list); |
|
277 |
while (it != list_end(shooter_list)) { |
|
278 |
gunner_t *p = *(gunner_t**)list_node_val(it); |
|
279 |
get_random_spawn(map1, p); |
|
280 |
gunner_set_curr_health(p, gunner_get_health(p)); |
|
281 |
it = list_node_next(it); |
|
282 |
} |
|
283 |
timer_reset(in_game_timer); |
|
284 |
} |
|
218 |
if (last_lb ^ keys->lb_pressed && keys->lb_pressed) |
|
219 |
shoot_bullet(shooter1, bullet_list, bsp_bullet); |
|
285 | 220 |
break; |
286 | 221 |
} |
287 |
break; |
|
288 |
case MOUSE_IRQ: |
|
289 |
if (counter_mouse_ih >= 3) { |
|
290 |
mouse_parse_packet(packet_mouse_ih, &pp); |
|
291 |
update_mouse(&pp); |
|
292 |
switch (game_state) { |
|
293 |
case MENU: |
|
294 |
if (!click) click = last_lb ^ keys->lb_pressed && keys->lb_pressed; |
|
295 |
break; |
|
296 |
case GAME: |
|
297 |
if (last_lb ^ keys->lb_pressed && keys->lb_pressed) |
|
298 |
shoot_bullet(shooter1, bullet_list, bsp_bullet); |
|
299 |
break; |
|
300 |
} |
|
301 |
last_lb = keys->lb_pressed; |
|
302 |
counter_mouse_ih = 0; |
|
222 |
last_lb = keys->lb_pressed; |
|
223 |
counter_mouse_ih = 0; |
|
303 | 224 |
|
304 |
} |
|
305 |
break; |
|
306 | 225 |
} |
226 |
break; |
|
227 |
#endif |
|
228 |
#ifdef DIOGO |
|
229 |
case COM1_IRQ: |
|
230 |
printf("You've got mail.\n"); |
|
231 |
break; |
|
232 |
#endif |
|
307 | 233 |
} |
308 | 234 |
} |
235 |
} |
|
309 | 236 |
|
310 |
break; |
|
311 |
default: |
|
312 |
break; /* no other notifications expected: do nothing */ |
|
313 |
} |
|
314 |
} else { /* received standart message, not a notification */ |
|
315 |
/* no standart message expected: do nothing */ |
|
237 |
break; |
|
238 |
default: |
|
239 |
break; /* no other notifications expected: do nothing */ |
|
316 | 240 |
} |
241 |
} else { /* received standart message, not a notification */ |
|
242 |
/* no standart message expected: do nothing */ |
|
317 | 243 |
} |
244 |
} |
|
318 | 245 |
|
319 |
while(list_size(shooter_list) > 0){
|
|
320 |
gunner_t *p = list_erase(shooter_list, list_begin(shooter_list));
|
|
321 |
gunner_dtor(p);
|
|
322 |
}
|
|
246 |
while(list_size(shooter_list) > 0){ |
|
247 |
gunner_t *p = list_erase(shooter_list, list_begin(shooter_list)); |
|
248 |
gunner_dtor(p); |
|
249 |
} |
|
323 | 250 |
|
324 |
while(list_size(bullet_list) > 0){
|
|
325 |
bullet_t *p = (bullet_t*)list_erase(bullet_list, list_begin(bullet_list));
|
|
326 |
bullet_dtor(p);
|
|
327 |
}
|
|
328 |
if(list_dtor(shooter_list)) printf("COULD NOT DESTRUCT SHOOTER LIST\n");
|
|
329 |
if(list_dtor(bullet_list)) printf("COULD NOT DESTRUCT BULLET LIST\n");
|
|
251 |
while(list_size(bullet_list) > 0){ |
|
252 |
bullet_t *p = (bullet_t*)list_erase(bullet_list, list_begin(bullet_list)); |
|
253 |
bullet_dtor(p); |
|
254 |
} |
|
255 |
if(list_dtor(shooter_list)) printf("COULD NOT DESTRUCT SHOOTER LIST\n"); |
|
256 |
if(list_dtor(bullet_list)) printf("COULD NOT DESTRUCT BULLET LIST\n"); |
|
330 | 257 |
|
331 |
timer_dtor(in_game_timer); in_game_timer = NULL;
|
|
258 |
timer_dtor(in_game_timer); in_game_timer = NULL; |
|
332 | 259 |
|
333 |
basic_sprite_dtor (bsp_crosshair); bsp_crosshair = NULL;
|
|
334 |
basic_sprite_dtor (bsp_shooter ); bsp_shooter = NULL;
|
|
335 |
sprite_dtor (sp_crosshair ); sp_crosshair = NULL;
|
|
336 |
basic_sprite_dtor (bsp_pistol ); bsp_pistol = NULL;
|
|
337 |
basic_sprite_dtor (bsp_nothing ); bsp_nothing = NULL;
|
|
338 |
map_dtor (map1 ); map1 = NULL;
|
|
339 |
font_dtor (consolas ); consolas = NULL;
|
|
260 |
basic_sprite_dtor (bsp_crosshair); bsp_crosshair = NULL; |
|
261 |
basic_sprite_dtor (bsp_shooter ); bsp_shooter = NULL; |
|
262 |
sprite_dtor (sp_crosshair ); sp_crosshair = NULL; |
|
263 |
basic_sprite_dtor (bsp_pistol ); bsp_pistol = NULL; |
|
264 |
basic_sprite_dtor (bsp_nothing ); bsp_nothing = NULL; |
|
265 |
map_dtor (map1 ); map1 = NULL; |
|
266 |
font_dtor (consolas ); consolas = NULL; |
|
340 | 267 |
|
341 |
// Unsubscribe interrupts
|
|
342 |
if (unsubscribe_all()) {
|
|
343 |
if (cleanup())
|
|
344 |
printf("%s: failed to cleanup.\n", __func__);
|
|
345 |
return 1;
|
|
346 |
}
|
|
268 |
// Unsubscribe interrupts |
|
269 |
if (unsubscribe_all()) { |
|
270 |
if (cleanup()) |
|
271 |
printf("%s: failed to cleanup.\n", __func__); |
|
272 |
return 1; |
|
273 |
} |
|
347 | 274 |
|
348 | 275 |
|
349 |
if (cleanup()) { |
|
350 |
printf("%s: failed to cleanup.\n", __func__); |
|
351 |
return 1; |
|
352 |
} |
|
353 |
#endif |
|
276 |
if (cleanup()) { |
|
277 |
printf("%s: failed to cleanup.\n", __func__); |
|
278 |
return 1; |
|
279 |
} |
|
354 | 280 |
|
355 |
|
|
356 | 281 |
return 0; |
357 | 282 |
} |
Also available in: Unified diff