Revision 238
changed a small thing but not yet working, go telmo!
proj.c | ||
---|---|---|
231 | 231 |
#ifdef TELMO |
232 | 232 |
if (i == 0) { |
233 | 233 |
if (no_interrupts % refresh_count_value == 0) { |
234 |
update_movement(map1, shooter1, shooter2);
|
|
234 |
update_movement(map1, shooter_list);
|
|
235 | 235 |
//bullet_update_movement(bullet); |
236 | 236 |
|
237 | 237 |
if (no_interrupts % 180 == 0) gunner_set_pos(shooter2, 775, 75); |
... | ... | |
242 | 242 |
printf("COLLIDING\n"); |
243 | 243 |
} |
244 | 244 |
|
245 |
/*if (gunner_collides_bullet(shooter1, bullet)) { |
|
246 |
printf("Bullet Collide with Shooter\n"); |
|
247 |
gunner_set_curr_health(shooter1, gunner_get_curr_health(shooter1) - bullet_get_damage(bullet)); |
|
248 |
}*/ |
|
249 | 245 |
update_scale(); |
250 | 246 |
|
251 | 247 |
ent_set_origin(gunner_get_x(shooter1)-ent_get_XLength()/2.0, |
... | ... | |
297 | 293 |
} |
298 | 294 |
|
299 | 295 |
#ifdef TELMO |
300 |
//gunner_dtor(shooter1); shooter1 = NULL; |
|
301 |
//gunner_dtor(shooter2); shooter2 = NULL; |
|
302 |
|
|
303 | 296 |
while(list_size(shooter_list) > 0){ |
304 | 297 |
gunner_t *p = list_erase(shooter_list, list_begin(shooter_list)); |
305 | 298 |
gunner_dtor(p); |
Also available in: Unified diff