Changeset 11758
- Timestamp:
- Feb 17, 2018, 11:36:30 PM (7 years ago)
- Location:
- code/branches/Presentation_HS17_merge/src/modules/flappyorx
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h
r11757 r11758 92 92 float tubeOffsetX; 93 93 94 int upwardThrust;95 int gravity;96 97 94 inline void setSpeedBase(float speedBase){ this-> speedBase = speedBase;} 98 95 inline float getSpeedBase(){ return speedBase;} … … 106 103 107 104 108 bool bEndGame;109 105 bool bIsDead; 110 106 bool firstGame; … … 112 108 std::queue<float> tubes; //Saves Position of Tubes 113 109 std::queue<MovableEntity*> asteroids; //Stores Asteroids which build up the tubes 114 float speed = 100;115 110 116 111 private: … … 126 121 WeakPtr<FlappyOrxShip> player; 127 122 128 int level;129 123 int point; 130 bool b_combo;131 124 132 125 const int NUM_ASTEROIDS = 5; -
code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc
r11755 r11758 44 44 45 45 this->FlappyOrxGame = nullptr; 46 this->bShowLives_ = false;47 this->bShowLevel_ = true;48 46 this->bShowPoints_ = false; 49 this->bShowMultiplier_ = false;50 47 this->bShowGameOver_ = false; 51 this->sGameOverMessage_ = "";52 48 } 53 49 -
code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h
r11576 r11758 45 45 virtual void changedOwner() override; 46 46 47 inline void setShowLives(bool value)48 { this->bShowLives_ = false; }49 inline bool getShowLives() const50 { return this->bShowLives_; }51 52 inline void setShowLevel(bool value)53 { this->bShowLevel_ = false; }54 inline bool getShowLevel() const55 { return this->bShowLevel_; }56 57 47 inline void setShowPoints(bool value) 58 48 { this->bShowPoints_ = value; } 59 49 inline bool getShowPoints() const 60 50 { return this->bShowPoints_; } 61 62 inline void setShowMultiplier(bool value)63 { this->bShowMultiplier_ = false; }64 inline bool getShowMultiplier() const65 { return this->bShowMultiplier_; }66 51 67 52 inline void setShowMessage(bool value){ … … 77 62 { return messageID; } 78 63 79 80 81 82 64 private: 83 65 FlappyOrx* FlappyOrxGame; 84 bool bShowLives_;85 bool bShowLevel_;86 66 bool bShowPoints_; 87 bool bShowMultiplier_;88 67 bool bShowGameOver_; 89 68 int messageID; 90 std::string sGameOverMessage_;91 69 }; 92 70 } -
code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h
r11755 r11758 85 85 FlappyOrx* getGame(); 86 86 WeakPtr<FlappyOrx> game; 87 Camera* camera;88 87 ParticleSpawner* particlespawner_; 89 88 bool isFlapping;
Note: See TracChangeset
for help on using the changeset viewer.