ELEC2645 (2018/19) / Mbed 2 deprecated el17cd

Dependencies:   mbed

Revision:
31:e681177037ef
Parent:
30:91038c2afec7
Child:
32:9c250eda7f3f
--- a/Game/Game.h	Fri Apr 05 13:54:34 2019 +0000
+++ b/Game/Game.h	Fri Apr 05 15:34:28 2019 +0000
@@ -3,7 +3,7 @@
 #define FACE_H
 #include "Face.h"
 #endif
-#include "Rasturizer.h"
+#include "Renderer.h"
 #ifndef CUBE_H
 #define CUBE_H
 #include "Cube.h"
@@ -27,30 +27,34 @@
     bool bCooldown;
 };
 
+
+struct MenuSelections{
+    int deathMenuSelection;
+    int homeMenuSelection;
+};
+
 class Game {
   private:
     Input input;
+    MenuSelections menuSelections;
+    
     int noOfCubes;
-    
     bool playing;
     int score;
     int highScore;
+    bool inHomeMenu;
+    int helpScreenNumber;
     
-    bool inHomeMenu;
-    int help;
-    int homeSelection;
-    bool deathMenuSelection;
     FILE *filePointer;
     
-    Vector2D coord;
-    Cube cubeArray[25];
-    Face faceArray[150];
+    Cube cubeArray[25]; //Store cubes
+    Face faceArray[150]; //Store all cubes faces
 
     Ticker disableA;
     Ticker disableB;
     Ticker disableY;
     Gamepad gamepad;
-    Rasturizer renderer;
+    Renderer renderer;
     
     int readHighScore();
     /** @brief Reads the highscore stored in the SD card