Diff: lib/Banana/Banana.cpp

Revision:

11:b288d01533cc

Parent:

10:28575a6eaa13

Child:

12:50a7abf21f18

--- a/lib/Banana/Banana.cpp	Tue May 07 22:49:13 2019 +0000
+++ b/lib/Banana/Banana.cpp	Tue May 07 23:01:46 2019 +0000
@@ -16,15 +16,14 @@
 
 }
 
-void Banana::banana_init() {
-    int banana_x = 30;
-    int banana_y = 0;
-    int banana_speed = 0;
-    int banana_min = 0;
-    int banana_max = 76;
-    int banana_time = 0;
-    int score = 0;
-}
+int banana_x = 30;
+int banana_y = 0;
+int banana_speed = 0;
+int banana_min = 0;
+int banana_max = 76;
+int banana_time = 0;
+int score = 0;
+
 
 void Banana::banana_drop(Gamepad &pad, N5110 &lcd, Barrel &barrel, Donkey &dky) {
     int game_banana[8][8] = {
@@ -37,7 +36,7 @@
     {1,1,1,1,1,1,0,0,},
     {0,1,1,1,0,0,0,0,},
 };
-    while (((banana_x + 8) >= barrel.barrel_x) & (banana_x <= (barrel.barrel_x + 8))) {
+    while (((banana_x + 8) >= barrel_x) & (banana_x <= (barrel_x + 8))) {
         banana_x = rand() % (banana_max + 1 - banana_min) + banana_min;
     }
     lcd.drawSprite(banana_x,banana_y,8,8,(int *)game_banana);
@@ -48,7 +47,7 @@
         banana_y = 0;
         banana_time = banana_time + 0.1;
     }
-    if ((banana_y >= 34) & ((banana_x + 7) >= dky.donkeykong_x) & (banana_x <= (dky.donkeykong_x + 15))) {
+    if ((banana_y >= 34) & ((banana_x + 7) >= donkeykong_x) & (banana_x <= (donkeykong_x + 15))) {
         score = score + 10 + banana_time;
     }
 }
\ No newline at end of file