From 0f92a1ae2687bcced06b9119770fca185993cef2 Mon Sep 17 00:00:00 2001 From: Bruno Figueiredo Date: Sun, 28 Jul 2002 18:19:17 +0000 Subject: [PATCH] changed again the GAMESTATE Reset, to correct the switch game + initial assertion bug --- stepmania/src/GameState.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index fd9f417dd9..fc3c977418 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -23,6 +23,7 @@ GameState* GAMESTATE = NULL; // global and accessable from anywhere in our progr GameState::GameState() { m_sLoadingMessage = "Initializing hardware..."; + m_CurGame = GAME_DANCE; Reset(); } @@ -42,8 +43,10 @@ void GameState::Reset() m_aGameplayStatistics.RemoveAll(); - // But we just changed to our brand new style !! (ez2 or smth) - // m_CurGame = GAME_DANCE; + // We can simply reset it cause it would override the selection the user just did + // Moved to the constructor for now + //m_CurGame = GAME_DANCE; + m_CurStyle = STYLE_NONE; m_MasterPlayerNumber = PLAYER_INVALID;