From e00d5fe83492637f13f7640a3851ce39c326734a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 4 Jan 2005 01:47:11 +0000 Subject: [PATCH] cleanup, assertion --- stepmania/src/GameState.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 1c149974b1..fd01e4501f 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -834,15 +834,6 @@ const Game* GameState::GetCurrentGame() const Style* GameState::GetCurrentStyle() const { - /* - // HACK: if we're in TM doing PLAY_MODE_BATTLE or PLAY_MODE_RAVE, - // pretend that we're doing STYLE_TECHNO_VERSUS8 instead. - // What is the problem that this is fixing? -Chris - if( m_CurGame == GAME_TECHNO && - ( m_PlayMode == PLAY_MODE_BATTLE || m_PlayMode == PLAY_MODE_RAVE ) ) - return GAMEMAN->GetStyleForStyle( STYLE_TECHNO_VERSUS8 ); - */ - return m_pCurStyle; } @@ -870,6 +861,7 @@ int GameState::GetNumPlayersEnabled() const bool GameState::PlayerUsingBothSides() const { + ASSERT( this->GetCurrentStyle() != NULL ); return this->GetCurrentStyle()->m_StyleType == ONE_PLAYER_TWO_SIDES; }