Diff: Miner/Miner.cpp

Revision:

30:6d6b48fe3679

Parent:

29:d85886364643

Child:

32:5dc769ba4a58

diff -r d85886364643 -r 6d6b48fe3679 Miner/Miner.cpp
--- a/Miner/Miner.cpp	Wed Apr 10 00:50:14 2019 +0000
+++ b/Miner/Miner.cpp	Wed Apr 10 14:29:14 2019 +0000
@@ -3,6 +3,7 @@
 Miner::Miner()
 {
     _enem.eflag[0] = false;
+    _j_flag = false;
 }
 
 Miner::~Miner()
@@ -29,7 +30,6 @@
     if (_direction == 0) {
         lcd.drawSprite(_x,_y,8,3,(int *)miner_left);
     }
-
 }
 void Miner::miner_land(N5110 &lcd)
 {
@@ -45,7 +45,7 @@
         _direction = 1; //chooses right facing sprite
     }
     if (d==W || d==NW) {
-        _x --;
+        _x--;
         _direction = 0; //chooses left facing sprite
     }
     if(_x > 81) {
@@ -57,17 +57,30 @@
 }
 
 void Miner::miner_jump(N5110 &lcd, Gamepad &pad)
-{
-    while(pad.check_event(Gamepad::A_PRESSED) && _jump==1) {
-        _y-=8;
-        pad.tone(750,0.1);
+{   
+    if(pad.check_event(Gamepad::A_PRESSED) && _jump == true) {
+        _j_flag = true;
+    }
+    if(_j_flag == true) {
+        _y--;
+        _j_counter++;
     }
+    if(_j_counter > 7) {
+        _j_flag = false;
+    }
+    if(_j_flag == false) {
+        _j_counter = 0;
+    }
+    //printf("counter %i \n", _j_counter);
+    //printf("flag %d \n", _j_flag);
+    //printf("jumo %d \n", _jump);
+    
 }
 
 void Miner::miner_gravity(N5110 &lcd)
 {
     if(_gravity == 1) {
-        _y = _y + 1;
+        _y++;
     }
 }
 
@@ -102,9 +115,9 @@
 bool Miner::enemy_collision(int i)
 {
     Vector2D p = get_pos();
-    
+
     if (p.x < _enem.ex[i] + 2 && p.x + 2 > _enem.ex[i] && p.y < _enem.ey[i] + 4
-     && p.y + 9 > _enem.ey[i]) {
+            && p.y + 9 > _enem.ey[i]) {
         return true;
     } else {
         return false;