Diff: Engine.h

Revision:

11:10c01766f774

Parent:

10:b2dd5f484f98

Child:

12:d68c757d829a

--- a/Engine.h	Tue Apr 25 10:13:53 2017 +0000
+++ b/Engine.h	Mon May 01 13:01:57 2017 +0000
@@ -26,40 +26,38 @@
     
     int collisions;
     int wave_counter;
+    int ammo;
+    bool trigger;
+    int _x;
+    int _y;
 
-    void init(int friendly_width,int friendly_height,int ship_size,int speed,N5110 &lcd, Gamepad &pad);
+    void init(int speed, N5110 &lcd, Gamepad &pad);
     void read_input(Gamepad &pad);
     void checker(N5110 &lcd, Gamepad &pad);
     void update(N5110 &lcd, Gamepad &pad);
     void draw(N5110 &lcd);    
-    void shoot(N5110 &lcd, Gamepad &pad, int speed);
+    void shoot(N5110 &lcd, Gamepad &pad);
     
 private:
     
-    void grid_draw(N5110 &lcd);
     void ships_draw(N5110 &lcd);
     void check_wall_collision(Gamepad &pad);
     void check_friendly_collisions(Gamepad &pad);
     void check_pass(Gamepad &pad);
-    void check_death1(N5110 &lcd, Gamepad &pad);
-    void check_death2(N5110 &lcd, Gamepad &pad);
-    void check_death3(N5110 &lcd, Gamepad &pad);
-    void check_death4(N5110 &lcd, Gamepad &pad);
-    void check_death5(N5110 &lcd, Gamepad &pad);
-    void check_death6(N5110 &lcd, Gamepad &pad);
-    void check_death(N5110 &lcd, Gamepad &pad);
+    void check_enemy_death(Gamepad &pad);
+    void check_death(Gamepad &pad, Vector2D ship_pos);
+    void check_death_all(N5110 &lcd, Gamepad &pad);
     void game_over(N5110 &lcd, Gamepad &pad);
+    void level_two(N5110 &lcd, Gamepad &pad);
+    void level_three(N5110 &lcd, Gamepad &pad);
+    void level_four(N5110 &lcd, Gamepad &pad);
+    void level_five(N5110 &lcd, Gamepad &pad);
     void wave_draw(N5110 &lcd);
     
     Friendly _friendly;
-     
-    int _friendly_width;
-    int _friendly_height;
-    int _ship_size;
+    
     int _speed;
-    
-    int _friendlyx;
-    
+
     
     Ship1 _ship1;
     Ship2 _ship2;