ELEC2645 (2017/18) / Mbed 2 deprecated el17yw

Dependencies:   mbed

Revision:
18:78001ecadcb2
Parent:
17:7acfc8a0c277
Child:
19:362ad1cd6d4a
diff -r 7acfc8a0c277 -r 78001ecadcb2 engine/engine.h
--- a/engine/engine.h	Tue Apr 24 19:24:03 2018 +0000
+++ b/engine/engine.h	Sat Apr 28 21:12:33 2018 +0000
@@ -6,10 +6,11 @@
 #include "Gamepad.h"
 #include "rect.h"
 #include "boom.h"
+#include "bigboom.h"
 #include "money.h"
 
 
-#define GAP 2
+//#define GAP 2
 
 class engine
 {
@@ -25,13 +26,15 @@
 
 private:
     
-    void engine::check_boom_collision(Gamepad &pad,N5110 &lcd);
-    void engine::check_money_collision(Gamepad &pad,N5110 &lcd);
-    void engine::check_boom_edgecollision(Gamepad &pad,N5110 &lcd);
+    void check_boom_collision(Gamepad &pad,N5110 &lcd);
+    void check_money_collision(Gamepad &pad,N5110 &lcd);
+    void check_boom_right_collision(Gamepad &pad,N5110 &lcd);
+    void check_boom_left_collision(Gamepad &pad,N5110 &lcd);
+    void check_bigboom_pos(Gamepad &pad);
     
-    void engine::check_money_pos(Gamepad &pad);
-    void engine::check_rect_pos(Gamepad &pad);
-    void engine::check_boom_pos(Gamepad &pad);
+    void check_money_pos(Gamepad &pad);
+    void check_rect_pos(Gamepad &pad);
+    void check_boom_pos(Gamepad &pad);
     
 
     void print_scores(N5110 &lcd);
@@ -44,6 +47,8 @@
     
     money _money;
     
+    bigboom _bigboom;
+    
     
     
     Direction _d;