ELEC2645 (2018/19) / Mbed 2 deprecated el17zl

Dependencies:   mbed

Fork of el17zl by Zhenwen Liao

Revision:
4:750d3f9b54de
Parent:
2:9f0d9516a6cd
Child:
5:b50ce6160013
diff -r 9fa31396d89d -r 750d3f9b54de PushingEngine/PushingEngine.h
--- a/PushingEngine/PushingEngine.h	Sun Mar 24 22:41:22 2019 +0000
+++ b/PushingEngine/PushingEngine.h	Tue Apr 09 08:31:27 2019 +0000
@@ -16,17 +16,15 @@
     PushingEngine();
     ~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 corss2_x,int cross1_x,int cross2_y);
+    void init(int box1_x,int box1_y,int box2_x,int box2_y,int ppl_x,int ppl_y);
     void read_input(Gamepad &pad);
     void update(Gamepad &pad);
     void draw(N5110 &lcd);
 
 private:
 
-    //void check_wall_collision(Gamepad &pad);
-    //void check_paddle_collisions(Gamepad &pad);
-    void check_goal(Gamepad &pad);
-    void print_scores(N5110 &lcd);
+    void check_ppl_box1_touching(Gamepad &pad);
+    void check_ppl_box2_touching(Gamepad &pad);
 
     Box _b1;
     Box _b2;
@@ -43,16 +41,6 @@
     int _pplx;
     int _pply;
 
-    Cross _c1;
-    Cross _c2;
-
-    int _c1x;
-    int _c2x;
-    int _c1y;
-    int _c2y;
-
-    Direction _d;
-    float _mag;
 
 };