ELEC2645 (2018/19) / Mbed 2 deprecated el17zl

Dependencies:   mbed

Fork of el17zl by Zhenwen Liao

Revision:
10:726c1489894e
Parent:
9:1fa7f087051e
Child:
11:f5d0ea7e4b74
--- a/PushingEngine/PushingEngine.h	Thu Apr 18 16:10:42 2019 +0000
+++ b/PushingEngine/PushingEngine.h	Mon Apr 22 07:39:26 2019 +0000
@@ -7,6 +7,7 @@
 #include "Ppl.h"
 #include "Box.h"
 #include "Cross.h"
+#include "Menu.h"
 
 
 
@@ -20,11 +21,12 @@
     ~PushingEngine();
 
     void init(int box1_x,int box1_y,int box2_x,int box2_y,int ppl_x,int ppl_y,
-              int cross1_x,int cross1_y,int cross2_x,int cross2_y);
+              int cross1_x,int cross1_y,int cross2_x,int cross2_y,int menu_x,int menu_y);
     void read_input(Gamepad &pad);
     void update(Gamepad &pad,int barrier_x,int barrier_y);
     void draw(N5110 &lcd,int barrier_x,int barrier_y);
     int set_score();
+    Vector2D print_menu(N5110 &lcd,Gamepad &pad);
     
 
 private:
@@ -61,12 +63,16 @@
     int _c1y;
     int _c2y;
     
+    Menu _menu;
+    
         //reading of bottom
     int _bb;
     int _bx;
     int _by;
     int _ba;
     int _bjoy;
+    int _bj;
+    
 
     //parameter for touching 
     int _s; //ppl with b1