From 3ca941f0ce9724e6e0140b6593f2a8ebe37d4e36 Mon Sep 17 00:00:00 2001 From: Rynort Date: Mon, 13 Nov 2023 17:20:33 -0500 Subject: [PATCH] Update engine.cpp --- SQCSim2021/engine.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/SQCSim2021/engine.cpp b/SQCSim2021/engine.cpp index e979127..e5d97d1 100644 --- a/SQCSim2021/engine.cpp +++ b/SQCSim2021/engine.cpp @@ -73,7 +73,7 @@ void Engine::DrawSplachScreen() glMatrixMode(GL_MODELVIEW); glPopMatrix(); - m_gamestate = GameState::SINGLEMULTI; + m_gamestate = GameState::MAIN_MENU; } @@ -1123,15 +1123,12 @@ 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::SINGLEMULTI) + else if (m_gamestate == GameState::MAIN_MENU) { - if (!m_soloMultiChoiceMade) { - DisplaySingleOrMultiplayerMenu(); - } - else { - DrawMenu(); - } + DrawMenu(); } + else if (m_gamestate == GameState::SINGLEMULTI) + DisplaySingleOrMultiplayerMenu(); else if (m_gamestate == GameState::QUIT) Stop(); } @@ -1322,7 +1319,7 @@ void Engine::MousePressEvent(const MOUSE_BUTTON& button, int x, int y) { else if (m_gamestate == GameState::MAIN_MENU) { if ((m_mousemx >= 285 && m_mousemx <= 490) && (m_mousemy >= 150 && m_mousemy <= 250)) - m_gamestate = GameState::PLAY; + m_gamestate = GameState::SINGLEMULTI; if ((m_mousemx >= 305 && m_mousemx <= 450) && (m_mousemy >= 300 && m_mousemy <= 400)) m_gamestate = GameState::QUIT; }