Merge branch 'master' into SQC32_sauveParams
This commit is contained in:
		| @@ -31,7 +31,7 @@ public: | ||||
|     Engine(); | ||||
|     virtual ~Engine(); | ||||
|     virtual void DrawMenu(); | ||||
|     virtual void DrawPause(); | ||||
|     virtual void DrawOption(); | ||||
|     virtual void DrawSplachScreen(); | ||||
|     virtual void Init(); | ||||
|     virtual void DeInit(); | ||||
| @@ -104,15 +104,20 @@ private: | ||||
|     std::chrono::high_resolution_clock::time_point m_startTime; | ||||
|  | ||||
|     //Menu | ||||
|     enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY, PAUSE }; | ||||
|     enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY, PAUSE, SINGLEMULTI }; | ||||
|  | ||||
|     GameState m_gamestate = GameState::MAIN_MENU; | ||||
|     Texture MenuTitleTexture; | ||||
|     Texture MenuBGTexture; | ||||
|     Texture MenuBGOptionTexture; | ||||
|     Texture MenuStartTexture; | ||||
|     Texture MenuQuitTexture; | ||||
|     Texture MenuOptionsTexture; | ||||
|     Texture PauseBGTexture; | ||||
|     Texture SplachScreenTexture; | ||||
|     Texture MusicTexture; //TODO | ||||
|     Texture OnOffBtnTexture;//TODO | ||||
|     Texture BackBtnTexture;//TODO | ||||
|  | ||||
|  | ||||
|     float m_scale; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user