Merge branch 'master' into SQC-15_paquets
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();
|
||||
@@ -109,15 +109,20 @@ private:
|
||||
netprot::ChunkMod* m_chunkmod = nullptr;
|
||||
|
||||
//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::PLAY;
|
||||
|
||||
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
|
||||
|
||||
Vector3f m_otherplayerpos = Vector3f(999, 999, 999);
|
||||
|
||||
|
Reference in New Issue
Block a user