diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 32056aee56..b33076989f 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -305,34 +305,6 @@ const StyleDef* GameState::GetCurrentStyleDef() return GAMEMAN->GetStyleDefForStyle( m_CurStyle ); } -bool GameState::IsPlayable( const ModeChoice& mc ) -{ - if( mc.m_bInvalid ) - return false; - - if ( mc.m_style != STYLE_INVALID ) - { - const int SidesJoinedToPlay = GAMEMAN->GetStyleDefForStyle(mc.m_style)->NumSidesJoinedToPlay(); - if( SidesJoinedToPlay != GAMESTATE->GetNumSidesJoined() ) - return false; - } - - /* Don't allow a PlayMode that's incompatible with our current Style (if set), - * and vice versa. */ - const PlayMode &rPlayMode = (mc.m_pm != PLAY_MODE_INVALID) ? mc.m_pm : m_PlayMode; - if( rPlayMode == PLAY_MODE_RAVE || rPlayMode == PLAY_MODE_BATTLE ) - { - // Can't play rave if there isn't enough room for two players. - // This is correct for dance (ie, no rave for solo and doubles), - // and should be okay for pump .. not sure about other game types. - const Style &rStyle = mc.m_style != STYLE_INVALID? mc.m_style: m_CurStyle; - if( rStyle != STYLE_INVALID && - GAMEMAN->GetStyleDefForStyle(rStyle)->m_iColsPerPlayer >= 6 ) - return false; - } - - return true; // no grounds to deny the request -} bool GameState::IsPlayerEnabled( PlayerNumber pn ) { diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h index 6b532498cf..2c300cfd01 100644 --- a/stepmania/src/GameState.h +++ b/stepmania/src/GameState.h @@ -26,7 +26,6 @@ class Steps; class Course; class GameDef; class StyleDef; -struct ModeChoice; class NoteFieldPositioning; class Character; class UnlockSystem; @@ -71,8 +70,6 @@ public: GameDef* GetCurrentGameDef(); const StyleDef* GetCurrentStyleDef(); - bool IsPlayable( const ModeChoice& mc ); - void GetPlayerInfo( PlayerNumber pn, bool& bIsEnabledOut, bool& bIsHumanOut ); bool IsPlayerEnabled( PlayerNumber pn ); bool IsPlayerEnabled( int p ) { return IsPlayerEnabled( (PlayerNumber)p ); };