Changeset 11537 for code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h

Timestamp:

Nov 6, 2017, 3:32:04 PM (8 years ago)

Author:

pascscha

Message:

Death

File:

• code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified) (3 diffs)

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

@@ -68 +68 @@
             virtual void start() override;
             virtual void end() override;
+            virtual void death();
             virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
 
@@ -92 +93 @@
             bool bShowLevel;
             std::queue<int> tubes;
+            std::queue<MovableEntity*> asteroids;
             int spawnDistance;
             int tubeOffsetX;
@@ -146 +148 @@
             int point;
             bool b_combo;
-            std::string Asteroid5[6] = {"Asteroid3_1","Asteroid3_2","Asteroid3_3","Asteroid3_4","Asteroid3_5","Asteroid3_6"};
-            std::string Asteroid10[6] = {"Asteroid6_1","Asteroid6_2","Asteroid6_3","Asteroid6_4","Asteroid6_5","Asteroid6_6"};
-            std::string Asteroid15[6] = {"Asteroid9_1","Asteroid9_2","Asteroid9_3","Asteroid9_4","Asteroid9_5","Asteroid9_6"};
-            std::string Asteroid20[6] = {"Asteroid12_1","Asteroid12_2","Asteroid12_3","Asteroid12_4","Asteroid12_5","Asteroid12_6"};
+
+            const std::string Asteroid5[6] = {"Asteroid3_1","Asteroid3_2","Asteroid3_3","Asteroid3_4","Asteroid3_5","Asteroid3_6"};
+            const std::string Asteroid10[6] = {"Asteroid6_1","Asteroid6_2","Asteroid6_3","Asteroid6_4","Asteroid6_5","Asteroid6_6"};
+            const std::string Asteroid15[6] = {"Asteroid9_1","Asteroid9_2","Asteroid9_3","Asteroid9_4","Asteroid9_5","Asteroid9_6"};
+            const std::string Asteroid20[6] = {"Asteroid12_1","Asteroid12_2","Asteroid12_3","Asteroid12_4","Asteroid12_5","Asteroid12_6"};
+