memartel/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

SQC-15_online #1

Merged
memartel merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00
Conversation 0 Commits 349 Files Changed 181 +6 -9
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3ca941f0ce - Show all commits

15
SQCSim2021/engine.cpp
View File

@@ -73,7 +73,7 @@ void Engine::DrawSplachScreen()
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glPopMatrix(); glPopMatrix();
m_gamestate = GameState::SINGLEMULTI; m_gamestate = GameState::MAIN_MENU;
} }
@@ -1123,15 +1123,12 @@ void Engine::Render(float elapsedTime) {
netprot::sendPackTo<netprot::Input>(m_conn.m_sock_udp, &input, &buf, &buflen, &m_conn.m_srvsockaddr); netprot::sendPackTo<netprot::Input>(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) { DrawMenu();
DisplaySingleOrMultiplayerMenu();
}
else {
DrawMenu();
}
} }
else if (m_gamestate == GameState::SINGLEMULTI)
DisplaySingleOrMultiplayerMenu();
else if (m_gamestate == GameState::QUIT) else if (m_gamestate == GameState::QUIT)
Stop(); Stop();
} }
@@ -1322,7 +1319,7 @@ void Engine::MousePressEvent(const MOUSE_BUTTON& button, int x, int y) {
else if (m_gamestate == GameState::MAIN_MENU) else if (m_gamestate == GameState::MAIN_MENU)
{ {
if ((m_mousemx >= 285 && m_mousemx <= 490) && (m_mousemy >= 150 && m_mousemy <= 250)) 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)) if ((m_mousemx >= 305 && m_mousemx <= 450) && (m_mousemy >= 300 && m_mousemy <= 400))
m_gamestate = GameState::QUIT; m_gamestate = GameState::QUIT;
} }