Revision 222
more collisions
proj.c | ||
---|---|---|
114 | 114 |
ent_set_scale(DEFAULT_SCALE); |
115 | 115 |
|
116 | 116 |
gunner_t *shooter1 = gunner_ctor(bsp_shooter, bsp_pistol); if(shooter1 == NULL) printf("Failed to get shooter1\n"); |
117 |
gunner_set_pos(shooter1, 0, 0);
|
|
117 |
gunner_set_pos(shooter1, 75, 75);
|
|
118 | 118 |
|
119 | 119 |
gunner_t *shooter2 = gunner_ctor(bsp_shooter, bsp_nothing); |
120 | 120 |
gunner_set_pos(shooter2, -50, -50); |
... | ... | |
153 | 153 |
#ifdef TELMO |
154 | 154 |
if (i == 0) { |
155 | 155 |
if (no_interrupts % refresh_count_value == 0) { |
156 |
update_movement(shooter1); |
|
156 |
update_movement(map1, shooter1);
|
|
157 | 157 |
|
158 | 158 |
if(map_collides_gunner(map1, shooter1)){ |
159 | 159 |
printf("COLLIDING\n"); |
... | ... | |
176 | 176 |
gunner_draw(shooter1); |
177 | 177 |
bullet_draw(bullet); |
178 | 178 |
|
179 |
t = clock()-t; printf("%d\n", (t*1000)/CLOCKS_PER_SEC); |
|
179 |
t = clock()-t; //printf("%d\n", (t*1000)/CLOCKS_PER_SEC);
|
|
180 | 180 |
|
181 | 181 |
sprite_draw(sp_crosshair); |
182 | 182 |
graph_draw(); |
Also available in: Unified diff