Changeset 11760 for code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h

Timestamp:

Feb 17, 2018, 11:50:25 PM (6 years ago)

Author:

landauf

Message:

[FlappyOrx_HS17] some cleanup

File:

• code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h (modified) (5 diffs)

code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h

@@ -83 +83 @@
 
             FlappyOrxShip* getPlayer();
-            
-            float speedBase;
-            float speedIncrease;
-
-            float tubeDistanceBase;
-            float tubeDistanceIncrease;
-            float tubeDistance;
-            float tubeOffsetX;
 
             inline void setSpeedBase(float speedBase){ this-> speedBase =  speedBase;}
@@ -106 +98 @@
             bool firstGame;
             std::string sDeathMessage;
-            std::queue<float> tubes;                  //Saves Position of Tubes
-            std::queue<MovableEntity*> asteroids;   //Stores Asteroids which build up the tubes
             
         private:
-             
-            const static int nCircles = 6;
-            int circlesUsed;
-            Circle circles[nCircles];
-
             void clearCircles();
             bool circleCollision(Circle &c1, Circle &c2);
             int addIfPossible(Circle c);
 
-            WeakPtr<FlappyOrxShip> player;
-
             int point;
 
-            const int NUM_ASTEROIDS = 5;
+            float speedBase;
+            float speedIncrease;
 
+            float tubeDistanceBase;
+            float tubeDistanceIncrease;
+            float tubeDistance;
+            float tubeOffsetX;
 
-           const std::string Asteroid5[5] = {"Asteroid3_1","Asteroid3_2","Asteroid3_3","Asteroid3_4","Asteroid3_5"};
-           const std::string Asteroid10[5] = {"Asteroid6_1","Asteroid6_2","Asteroid6_3","Asteroid6_4","Asteroid6_5"};
-           const std::string Asteroid15[5] = {"Asteroid9_1","Asteroid9_2","Asteroid9_3","Asteroid9_4","Asteroid9_5"};
-           const std::string Asteroid20[5] = {"Asteroid12_1","Asteroid12_2","Asteroid12_3","Asteroid12_4","Asteroid12_5"};
+            WeakPtr<FlappyOrxShip> player;
+            std::queue<float> tubes;                  //Saves Position of Tubes
+            std::queue<MovableEntity*> asteroids;   //Stores Asteroids which build up the tubes
+
+            const static int NUM_CIRCLES = 6;
+            int circlesUsed;
+            Circle circles[NUM_CIRCLES];
+
+            const static int NUM_ASTEROIDS = 5;
+
+            const std::string Asteroid5[5] = {"Asteroid3_1","Asteroid3_2","Asteroid3_3","Asteroid3_4","Asteroid3_5"};
+            const std::string Asteroid10[5] = {"Asteroid6_1","Asteroid6_2","Asteroid6_3","Asteroid6_4","Asteroid6_5"};
+            const std::string Asteroid15[5] = {"Asteroid9_1","Asteroid9_2","Asteroid9_3","Asteroid9_4","Asteroid9_5"};
+            const std::string Asteroid20[5] = {"Asteroid12_1","Asteroid12_2","Asteroid12_3","Asteroid12_4","Asteroid12_5"};
            
-            std::vector<std::string> DeathMessage7 = {
+            const std::vector<std::string> DeathMessage7 = {
                 "You should really try that again",
                 "You can do better, can you?",
@@ -142 +140 @@
                 "Here's a tip: Try not to fly into these grey thingies.",
                 "We won't comment on that."};
-            std::vector<std::string> DeathMessage20 = {
+            const std::vector<std::string> DeathMessage20 = {
                 "Getting better!",
                 "Training has paid off, huh?",
@@ -151 +149 @@
                 "That wasn't crap, not bad",
                 "Surprisingly not bad."};
-            std::vector<std::string> DeathMessage30 = {
+            const std::vector<std::string> DeathMessage30 = {
                 "Flappin great",
                 "Good job!",
@@ -158 +156 @@
                 "That was really good,!",
                 "We are proud of you"};
-            std::vector<std::string> DeathMessageover30 = {
+            const std::vector<std::string> DeathMessageover30 = {
                 "You're flappin amazing",
                 "Fucking great job",