Diff: Coin/Coin.cpp

Revision:

21:7d4827af00d6

Parent:

19:1073cc64cb0b

Child:

22:8e38efeae0c9

diff -r ad13b0fdd8ff -r 7d4827af00d6 Coin/Coin.cpp
--- a/Coin/Coin.cpp	Wed May 08 18:36:45 2019 +0000
+++ b/Coin/Coin.cpp	Wed May 08 23:17:35 2019 +0000
@@ -21,10 +21,6 @@
     return y_coin;
 }
 
-int Coin::coins(){
-    return coin;
-}
-
 void Coin::drawSprite(N5110 &lcd){
         lcd.drawSprite(x_coin,y_coin,2,2,(int *)coin_01);
 }
@@ -32,28 +28,19 @@
 bool Coin::collidePlayer(int x, int y, Gamepad &pad) {
     for (int ix = 0; ix < 7; ix++) {
         for (int iy = 0; iy < 7; iy++) {
-            /* if ( x + 3 == x_coin + ix  &&
-                 y + 3 == y_coin + iy) {
-                ++coin;
-                pad.tone(650,0.25);
-                return true;*/
-            if ( x + ix == x_coin - 1  &&
-                 y + iy == y_coin) {
+            if ( x + ix == x_coin - 1 && y + iy == y_coin) {
                 ++coin;
                 pad.tone(650,0.25);
                 return true; 
-            } else if ( x + ix == x_coin + 2  &&
-                 y + iy == y_coin) {
+            } else if ( x + ix == x_coin + 2 && y + iy == y_coin) {
                 ++coin;
                 pad.tone(650,0.25);
                 return true; 
-            } else if ( x + ix == x_coin   &&
-                 y + iy == y_coin - 1) {
+            } else if ( x + ix == x_coin && y + iy == y_coin - 1) {
                 ++coin;
                 pad.tone(650,0.25);
                 return true; 
-            } else if ( x + ix == x_coin   &&
-                 y + iy == y_coin + 2) {
+            } else if ( x + ix == x_coin && y + iy == y_coin + 2) {
                 ++coin;
                 pad.tone(650,0.25);
                 return true;
@@ -64,11 +51,10 @@
 }
 
 void Coin::spawn(int x, int y, N5110 &lcd, Gamepad &pad) {
-        drawSprite(lcd);
+    drawSprite(lcd);
     if (collidePlayer(x,y,pad) == true) {
+        //coin++;
         x_coin = 100;
         y_coin = 100;
-    } else {
-
     }
 }
\ No newline at end of file