Diff: Minerengine.cpp

Revision:

8:9bc80e40ac0d

Parent:

7:c6e6ec0e3396

Child:

9:f16581e1eba9

--- a/Minerengine.cpp	Mon Mar 25 11:19:20 2019 +0000
+++ b/Minerengine.cpp	Mon Mar 25 15:29:19 2019 +0000
@@ -1,7 +1,5 @@
 #include "Minerengine.h"
 
- int _x;
- int _y;
 
 Minerengine::Minerengine()
 
@@ -12,12 +10,12 @@
 {
 }
 
-/*void Minerengine::miner_init()
+void Minerengine::miner_init()
 {
     _x = 3;
     _y = 33;
 }
-*/
+
 
 void Minerengine::read_direction(Gamepad &pad)
 {
@@ -34,7 +32,7 @@
         _x += 1;
         _direction = 1;
     }
-    if (_d==7 && !lcd.getPixel(_x - 1, _y+1) && !lcd.getPixel(_x - 1, _y + 3) &&
+    if (_d==7 && !lcd.getPixel(_x - 1, _y + 1) && !lcd.getPixel(_x - 1, _y + 3) &&
             !lcd.getPixel(_x - 1, _y + 5)&& !lcd.getPixel(_x + 3, _y + 7)) {
 
         _x = _x - 1;
@@ -45,7 +43,7 @@
 
 void Minerengine::miner_jump(N5110 &lcd, Gamepad &pad)
 {
-    if(_d==3 && pad.check_event(Gamepad::A_PRESSED) && lcd.getPixel(_x, _y + 8)) {
+    if(_d==3 && pad.check_event(Gamepad::A_PRESSED) && lcd.getPixel(_x + 3, _y + 8)) {
         for (int i = 0; i < 6; i++) {
             _y = _y -1;
 
@@ -88,7 +86,7 @@
 
 void Minerengine::miner_gravity(N5110 &lcd)
 {
-    if(!lcd.getPixel(_x, _y + 8)) {
+    if(!lcd.getPixel(_x, _y + 8) && !lcd.getPixel(_x + 3, _y + 8)) {
         _y = _y + 1;
         wait(0.1);
     }