diff --git a/SQCSim2021/engine.cpp b/SQCSim2021/engine.cpp index 089ea46..32e18e0 100644 --- a/SQCSim2021/engine.cpp +++ b/SQCSim2021/engine.cpp @@ -322,18 +322,6 @@ void Engine::DrawOption() ShowCursor(); } -void Engine::Init() { - - - glDisable(GL_BLEND); - glEnable(GL_DEPTH_TEST); - glMatrixMode(GL_PROJECTION); - glPopMatrix(); - glMatrixMode(GL_MODELVIEW); - glPopMatrix(); - ShowCursor(); -} - void Engine::Init() { GLenum glewErr = glewInit(); @@ -1323,10 +1311,6 @@ void Engine::Render(float elapsedTime) { { DrawOption(); } - else if (m_gamestate == GameState::PAUSE) - { - DrawPause(); - } else if (m_gamestate == GameState::QUIT) Stop(); } diff --git a/SQCSim2021/engine.h b/SQCSim2021/engine.h index f3e7f67..3d6823f 100644 --- a/SQCSim2021/engine.h +++ b/SQCSim2021/engine.h @@ -107,7 +107,7 @@ private: std::chrono::high_resolution_clock::time_point m_startTime; //Menu - enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY,SINGLEMULTI }; + enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY, PAUSE, SINGLEMULTI }; GameState m_gamestate = GameState::MAIN_MENU; Texture MenuTitleTexture;