ELEC2645 (2018/19) / Mbed 2 deprecated el17set_

Dependencies:   mbed

Revision:
22:8e38efeae0c9
Parent:
21:7d4827af00d6
Child:
23:5e8a435e568f
diff -r 7d4827af00d6 -r 8e38efeae0c9 Game/Game.h
--- a/Game/Game.h	Wed May 08 23:17:35 2019 +0000
+++ b/Game/Game.h	Thu May 09 12:10:56 2019 +0000
@@ -12,54 +12,57 @@
 #include "Coin.h"
 
 class Game{
-    
-public:
+
+ public:
 
-    Game();
-    ~Game();
-    void init();
-    void dirmag(Gamepad &pad);
-    void drawSprite(N5110 &lcd);
-    void collect(N5110 &lcd,  Gamepad &pad);
-    void movement(Gamepad &pad,N5110 &lcd);
-    void position();
-    void damage(N5110 &lcd,Gamepad &pad);
-    void UI(Gamepad &pad,N5110 &lcd);
-    void death(N5110 &lcd);
-    void win(N5110 &lcd);
-    void display_health(N5110 &lcd);
-    int get_lives();
-    int get_coins();
-    
-private:
+  Game();
+  ~Game();
+  void init();
+  int get_lives();
+  void direc(Gamepad &pad);
+  void display_health(N5110 &lcd);
+  //void display_coins(N5110 &lcd);
+  void drawSprite(N5110 &lcd);
+  void movement(N5110 &lcd, Gamepad &pad);
+  //void coinIncrementer();
+  void collect(N5110 &lcd, Gamepad &pad);
+  void win(N5110 &lcd);
+  void damage(N5110 &lcd, Gamepad &pad);
+  void death(N5110 &lcd);
+  void UI(N5110 &lcd, Gamepad &pad);
+
+ private:
+
+  Smiley smiley;
+  Maze maze;
+  Menu menu;
+  Direction dir;
 
-    Smiley smiley;
-    Maze maze;
-    Enemy1 enemyA;
-    Enemy1 enemy1;
-    Enemy2 enemyB;
-    Enemy2 enemy2;
-    Coin coin1;
-    Coin coin2;
-    Coin coin3;
-    Coin coin4;
-    Coin coin5;
-    Coin coin6;
-    Coin coin7;
-    Coin coin8;
-    Coin coin9;
-    Coin coin10;
-    Coin coin11;
-    Coin coin12;
-    Coin coin13;
-    Menu menu;
-    Direction dir;
+  Enemy1 enemyA;
+  Enemy1 enemy1;
+  Enemy2 enemyB;
+  Enemy2 enemy2;
+  Enemy2 enemyC;
 
-    float mag;
-    int x;
-    int y;
-    int _lives;
-    int coin;
+  Coin coin0;
+  Coin coin1;
+  Coin coin2;
+  Coin coin3;
+  Coin coin4;
+  Coin coin5;
+  Coin coin6;
+  Coin coin7;
+  Coin coin8;
+  Coin coin9;
+  Coin coin10;
+  Coin coin11;
+  Coin coin12;
+  Coin coin13;
+
+  int x;
+  int y;
+  int _lives;
+  int coin;
 };
 
 #endif
\ No newline at end of file