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

mini changement

Browse Source
This commit is contained in:
Rynort 2023-11-13 15:42:04 -05:00
parent 79013fe5d1
commit 4c695fbe47
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SQCSim2021/engine.cpp
View File

@ -73,7 +73,7 @@ void Engine::DrawSplachScreen()
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glPopMatrix(); glPopMatrix();
m_gamestate = GameState::OPTIONS; m_gamestate = GameState::SINGLEMULTI;
} }
@ -1123,7 +1123,7 @@ 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::OPTIONS) else if (m_gamestate == GameState::MAIN_MENU || m_gamestate == GameState::SINGLEMULTI)
{ {
if (!m_soloMultiChoiceMade) { if (!m_soloMultiChoiceMade) {
DisplaySingleOrMultiplayerMenu(); 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)) if ((m_mousemx >= 305 && m_mousemx <= 450) && (m_mousemy >= 300 && m_mousemy <= 400))
m_gamestate = GameState::QUIT; m_gamestate = GameState::QUIT;
} }
else if (m_gamestate == GameState::OPTIONS) else if (m_gamestate == GameState::SINGLEMULTI)
{ {
float buttonWidthProportion = 0.4f; float buttonWidthProportion = 0.4f;
float buttonHeightProportion = 0.075f; float buttonHeightProportion = 0.075f;

2
SQCSim2021/engine.h
View File

@ -90,7 +90,7 @@ private:
std::map<uint64_t, Player*> m_players; std::map<uint64_t, Player*> m_players;
//Menu //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; GameState m_gamestate = GameState::MAIN_MENU;
Texture MenuTitleTexture; Texture MenuTitleTexture;
Texture MenuBGTexture; Texture MenuBGTexture;