Update engine.cpp
This commit is contained in:
parent
4c695fbe47
commit
3ca941f0ce
@ -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;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user