actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A proper fix for IsPlayable()

Browse Source
This commit is contained in:
Aaron VonderHaar
2003-09-15 04:54:00 +00:00
parent 2c72fe8009
commit 28d3633036
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+24 -15
View File
@@ -304,33 +304,42 @@ const StyleDef* GameState::GetCurrentStyleDef()
bool GameState::IsPlayable( const ModeChoice& mc ) bool GameState::IsPlayable( const ModeChoice& mc )
{ {
// Mode doesn't interest the caller, presumably because //
// a style has not been chosen yet. // If the ModeChoice doesn't specify something, we'll take that
if ( mc.pm == PLAY_MODE_INVALID ) // value from the current game state
return mc.numSidesJoinedToPlay == GAMESTATE->GetNumSidesJoined(); //
const PlayMode &rPlayMode = (mc.pm != PLAY_MODE_INVALID)
? mc.pm : m_PlayMode;
const Style &rStyle = (mc.style != STYLE_INVALID)
? mc.style : m_CurStyle;
// ModeChoice code sets numSidesJoinedToPlay properly iff style is set
const int numSidesJoined = (mc.style != STYLE_INVALID)
? mc.numSidesJoinedToPlay : GAMESTATE->GetNumSidesJoined();
// A style has been chosen, so now consider modes if ( numSidesJoined != GAMESTATE->GetNumSidesJoined() )
const Style &style = (mc.style != STYLE_INVALID) ? mc.style : m_CurStyle; return false;
ASSERT(style != STYLE_INVALID);
if( mc.pm == PLAY_MODE_RAVE ) if( rPlayMode == PLAY_MODE_RAVE || rPlayMode == PLAY_MODE_BATTLE )
{ {
// Can't play Rave without characters for attack definitions. // Can't play Rave without characters for attack definitions.
//X ... but we'll let ScreenSelectDifficulty give that message if( m_pCharacters.empty() )
//X (since that will give the user an explanation) return false;
//X
//Xif( m_pCharacters.empty() ) // If there is no current style ... well, we have no reasonable
//X return false; // grounds to disallow
if (rStyle == STYLE_INVALID)
return true;
// Can't play rave if there isn't enough room for two players. // 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), // This is correct for dance (ie, no rave for solo and doubles),
// and should be okay for pump .. not sure about other game types. // and should be okay for pump .. not sure about other game types.
if( GAMEMAN->GetStyleDefForStyle(style)->m_iColsPerPlayer >= 6 ) if( GAMEMAN->GetStyleDefForStyle(rStyle)->m_iColsPerPlayer >= 6 )
return false; return false;
return true;
} }
return true; // why not? return true; // no grounds to deny the request
} }
bool GameState::IsPlayerEnabled( PlayerNumber pn ) bool GameState::IsPlayerEnabled( PlayerNumber pn )