From 4c695fbe47b58965c3a34e1fc5dc11b188cd2220 Mon Sep 17 00:00:00 2001 From: Rynort Date: Mon, 13 Nov 2023 15:42:04 -0500 Subject: [PATCH] mini changement --- SQCSim2021/engine.cpp | 6 +++--- SQCSim2021/engine.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SQCSim2021/engine.cpp b/SQCSim2021/engine.cpp index 76f379b..e979127 100644 --- a/SQCSim2021/engine.cpp +++ b/SQCSim2021/engine.cpp @@ -73,7 +73,7 @@ void Engine::DrawSplachScreen() glMatrixMode(GL_MODELVIEW); glPopMatrix(); - m_gamestate = GameState::OPTIONS; + m_gamestate = GameState::SINGLEMULTI; } @@ -1123,7 +1123,7 @@ void Engine::Render(float elapsedTime) { netprot::sendPackTo(m_conn.m_sock_udp, &input, &buf, &buflen, &m_conn.m_srvsockaddr); } } - else if (m_gamestate == GameState::MAIN_MENU || m_gamestate == GameState::OPTIONS) + else if (m_gamestate == GameState::MAIN_MENU || m_gamestate == GameState::SINGLEMULTI) { if (!m_soloMultiChoiceMade) { DisplaySingleOrMultiplayerMenu(); @@ -1326,7 +1326,7 @@ void Engine::MousePressEvent(const MOUSE_BUTTON& button, int x, int y) { if ((m_mousemx >= 305 && m_mousemx <= 450) && (m_mousemy >= 300 && m_mousemy <= 400)) m_gamestate = GameState::QUIT; } - else if (m_gamestate == GameState::OPTIONS) + else if (m_gamestate == GameState::SINGLEMULTI) { float buttonWidthProportion = 0.4f; float buttonHeightProportion = 0.075f; diff --git a/SQCSim2021/engine.h b/SQCSim2021/engine.h index d51d064..6aa4f89 100644 --- a/SQCSim2021/engine.h +++ b/SQCSim2021/engine.h @@ -90,7 +90,7 @@ private: std::map m_players; //Menu - enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY }; + enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY,SINGLEMULTI }; GameState m_gamestate = GameState::MAIN_MENU; Texture MenuTitleTexture; Texture MenuBGTexture;