[Orxonox-commit 7141] r11758 - code/branches/Presentation_HS17_merge/src/modules/flappyorx

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-17 23:36:30 +0100 (Sat, 17 Feb 2018)
New Revision: 11758

Modified:
   code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h
   code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc
   code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h
   code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h
Log:
[FlappyOrx_HS17] removed unused variables

Modified: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h	2018-02-17 22:06:06 UTC (rev 11757)
+++ code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h	2018-02-17 22:36:30 UTC (rev 11758)
@@ -91,9 +91,6 @@
             float tubeDistance;
             float tubeOffsetX;
 
-            int upwardThrust;
-            int gravity;
-
             inline void setSpeedBase(float speedBase){ this-> speedBase =  speedBase;}
             inline float  getSpeedBase(){ return speedBase;}
             inline void setSpeedIncrease(float speedIncrease){ this-> speedIncrease =  speedIncrease;}
@@ -105,13 +102,11 @@
             inline float  getTubeDistanceIncrease(){ return tubeDistanceIncrease;}
 
             
-            bool bEndGame;
             bool bIsDead;
             bool firstGame;
             std::string sDeathMessage;
             std::queue<float> tubes;                  //Saves Position of Tubes
             std::queue<MovableEntity*> asteroids;   //Stores Asteroids which build up the tubes
-            float speed = 100;
             
         private:
              
@@ -125,9 +120,7 @@
 
             WeakPtr<FlappyOrxShip> player;
 
-            int level;
             int point;
-            bool b_combo;
 
             const int NUM_ASTEROIDS = 5;
 

Modified: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc	2018-02-17 22:06:06 UTC (rev 11757)
+++ code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc	2018-02-17 22:36:30 UTC (rev 11758)
@@ -43,12 +43,8 @@
         RegisterObject(FlappyOrxHUDinfo);
 
         this->FlappyOrxGame = nullptr;
-        this->bShowLives_ = false;
-        this->bShowLevel_ = true;
         this->bShowPoints_ = false;
-        this->bShowMultiplier_ = false;
         this->bShowGameOver_ = false;
-        this->sGameOverMessage_ = "";
     }
 
     void FlappyOrxHUDinfo::XMLPort(Element& xmlelement, XMLPort::Mode mode)

Modified: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h	2018-02-17 22:06:06 UTC (rev 11757)
+++ code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h	2018-02-17 22:36:30 UTC (rev 11758)
@@ -44,26 +44,11 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void changedOwner() override;
 
-            inline void setShowLives(bool value)
-                { this->bShowLives_ = false; }
-            inline bool getShowLives() const
-                { return this->bShowLives_; }
-
-            inline void setShowLevel(bool value)
-                { this->bShowLevel_ = false; }
-            inline bool getShowLevel() const
-                { return this->bShowLevel_; }
-
             inline void setShowPoints(bool value)
                 { this->bShowPoints_ = value; }
             inline bool getShowPoints() const
                 { return this->bShowPoints_; }
 
-            inline void setShowMultiplier(bool value)
-                { this->bShowMultiplier_ = false; }
-            inline bool getShowMultiplier() const
-                { return this->bShowMultiplier_; }
-
             inline void setShowMessage(bool value){
                 bShowGameOver_ = value;
             }
@@ -76,18 +61,11 @@
             inline int getMessageID() const
                 { return messageID; }
 
-
-
-
         private:
             FlappyOrx* FlappyOrxGame;
-            bool bShowLives_;
-            bool bShowLevel_;
             bool bShowPoints_;
-            bool bShowMultiplier_;
             bool bShowGameOver_;
             int messageID;
-            std::string sGameOverMessage_;
     };
 }
 #endif /* _FlappyOrxHUDinfo_H__ */

Modified: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h	2018-02-17 22:06:06 UTC (rev 11757)
+++ code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h	2018-02-17 22:36:30 UTC (rev 11758)
@@ -84,7 +84,6 @@
         private:
             FlappyOrx* getGame();
             WeakPtr<FlappyOrx> game;
-            Camera* camera;
             ParticleSpawner* particlespawner_;
             bool isFlapping;
             bool isDead;