Diff: PushingEngine/PushingEngine.cpp

Revision:

5:b50ce6160013

Parent:

4:750d3f9b54de

Child:

6:6b083e22cb53

--- a/PushingEngine/PushingEngine.cpp	Tue Apr 09 08:31:27 2019 +0000
+++ b/PushingEngine/PushingEngine.cpp	Tue Apr 09 12:46:02 2019 +0000
@@ -32,12 +32,12 @@
 
 void PushingEngine::read_input(Gamepad &pad)
 {
-    if (pad.check_event(Gamepad::START_PRESSED))
-       {_bstart = 1;}
-       else {_bstart = 0;}
-    if (pad.check_event(Gamepad::BACK_PRESSED))
-       {_bback = 1; }
-       else {_bback = 0;}
+    //if (pad.check_event(Gamepad::START_PRESSED))
+       //{_bstart = 1;}
+       //else {_bstart = 0;}
+    //if (pad.check_event(Gamepad::BACK_PRESSED))
+       //{_bback = 1; }
+       //else {_bback = 0;}
     if (pad.check_event(Gamepad::A_PRESSED))
        {_ba = 1; }
        else {_ba = 0;}
@@ -50,68 +50,61 @@
     if (pad.check_event(Gamepad::Y_PRESSED))
        {_by = 1; }
        else {_by = 0;}
-    if (pad.check_event(Gamepad::JOY_PRESSED))
-       {_bjoy = 1; }
-       else {_bjoy = 0;}
+    //if (pad.check_event(Gamepad::JOY_PRESSED))
+       //{_bjoy = 1; }
+       //else {_bjoy = 0;}
 }
 
 void  PushingEngine::check_ppl_box1_touching(Gamepad &pad) 
 {
     Vector2D b1_pos = _b1.get_pos();
     Vector2D ppl_pos = _ppl.get_pos();
-
-    int _s = 0;
-
+    
     if (b1_pos.y == ppl_pos.y) 
     {
-        if((ppl_pos.x-b1_pos.x) =8)
+        if((ppl_pos.x-b1_pos.x) ==8)
         {
             _s = 1; // can push to left
-        } else if((b1_pos.x-ppl_pos.x)=8)
+        } else if((b1_pos.x-ppl_pos.x)==8)
         {
             _s = 2; // can push to right
-        }
-    }
-
-    if (b1_pos.x == ppl_pos.x) 
+        } 
+    } else if (b1_pos.x == ppl_pos.x) 
     {
-        if((ppl_pos.y-b1_pos.y) =8)
+        if((ppl_pos.y-b1_pos.y) ==8)
         {
             _s = 4; // can push up
-        } else if((b1_pos.y-ppl_pos.y)=8)
+        } else if((b1_pos.y-ppl_pos.y)==8)
         {
             _s = 3; // can push down
-        }
-    }
+        } 
+    } else {_s = 0;}
 }
 
 void  PushingEngine::check_ppl_box2_touching(Gamepad &pad) //
 {
     Vector2D b2_pos = _b2.get_pos();
     Vector2D ppl_pos = _ppl.get_pos();
-    int _r = 0;
-
+    
     if (b2_pos.y == ppl_pos.y) 
     {
-        if((ppl_pos.x-b2_pos.x) =8)
+        if((ppl_pos.x-b2_pos.x) ==8)
         {
             _r = 1; // can push to left
-        } else if((b2_pos.x-ppl_pos.x)=8)
+        } else if((b2_pos.x-ppl_pos.x)==8)
         {
             _r = 2; // can push to right
-        }
-    }
-
-    if (b2_pos.x == ppl_pos.x) 
+        } 
+    } else if (b2_pos.x == ppl_pos.x) 
     {
-        if((ppl_pos.y-b2_pos.y) =8)
+        if((ppl_pos.y-b2_pos.y) ==8)
         {
             _r = 4; // can push up
-        } else if((b2_pos.y-ppl_pos.y)=8)
+        } else if((b2_pos.y-ppl_pos.y)==8)
         {
             _r = 3; // can push down
-        }
-    }
+        } 
+    } else {_r = 0;}
 }
 
 
@@ -123,7 +116,7 @@
     lcd.drawLine(0,3,0,45,1);
     lcd.drawLine(1,45,83,45,1);
     lcd.drawLine(83,3,83,44,1);
-    lcd.drawSprite(34,28,8,8,(int *)barrier);
+    //lcd.drawSprite(34,28,8,8,(int *)barrier);
     // boxes
     _b1.draw(lcd);
     _b2.draw(lcd);
@@ -137,8 +130,8 @@
     check_ppl_box1_touching(pad);
     check_ppl_box2_touching(pad);
 
-    _b1.update(_s,_ba,_bb,_bx,_by);
-    _b2.update(_r,_ba,_bb,_bx,_by);
-    _ppl.update(_ba,_bb,_bx,_by);
+    _b1.update(_s,_bb,_ba,_bx,_by);
+    _b2.update(_r,_bb,_ba,_bx,_by);
+    _ppl.update(_bb,_ba,_bx,_by);
 
 }