Project

General

Profile

Revision 220

gunner collisions

View differences:

proj.c
155 155
                                if (no_interrupts % refresh_count_value == 0) {
156 156
                                    update_movement(shooter1);
157 157

  
158
                                    if(map_collides(map1, gunner_get_x(shooter1), gunner_get_y(shooter1))){
158
                                    if(map_collides_gunner(map1, shooter1)){
159 159
                                        printf("COLLIDING\n");
160 160
                                    }
161 161

  
......
182 182
                                    graph_draw();
183 183
                                }
184 184
                            }
185
                            if (i == 12) {
186
                                if (counter_mouse_ih >= 3) {
187
                                    struct packet pp = mouse_parse_packet(packet_mouse_ih);
188
                                    update_mouse_position(&pp);
189
                                    //printf("X: %d Y: %d\n", get_mouse_X(), get_mouse_Y());
190
                                    counter_mouse_ih = 0;
191
                                }
192
                            }
185 193
                            #endif
186 194
                        }
187 195
                    }
188
                    #ifdef TELMO
189
                    if (counter_mouse_ih >= 3) {
190
                        struct packet pp = mouse_parse_packet(packet_mouse_ih);
191
                        update_mouse_position(&pp);
192
                        //printf("X: %d Y: %d\n", get_mouse_X(), get_mouse_Y());
193
                        counter_mouse_ih = 0;
194
                    }
195
                    #endif
196 196

  
197 197
                    break;
198 198
                default:

Also available in: Unified diff