add IsStepsPlayable, make IsStepsTypePlayable take the number of stages left into account

This commit is contained in:
Chris Danford
2007-03-12 01:47:03 +00:00
parent 544c445b49
commit 32586f28e1
7 changed files with 41 additions and 27 deletions
+2 -2
View File
@@ -159,7 +159,7 @@ void MusicWheel::BeginScreen()
/* Invalidate current Song if it can't be played
* because there are not enough stages remaining. */
if( GAMESTATE->m_pCurSong != NULL &&
GameState::GetNumStagesForSong( GAMESTATE->m_pCurSong ) > GAMESTATE->GetNumStagesLeft() )
GameState::GetNumStagesMultiplierForSong( GAMESTATE->m_pCurSong ) > GAMESTATE->GetNumStagesLeft() )
{
GAMESTATE->m_pCurSong.Set( NULL );
}
@@ -698,7 +698,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData *> &arrayWheelItemDat
{
WID.m_Flags.bHasBeginnerOr1Meter = WID.m_pSong->IsEasy( GAMESTATE->GetCurrentStyle()->m_StepsType );
WID.m_Flags.bEdits = WID.m_pSong->HasEdits( GAMESTATE->GetCurrentStyle()->m_StepsType );
WID.m_Flags.iStagesForSong = GameState::GetNumStagesForSong( WID.m_pSong );
WID.m_Flags.iStagesForSong = GameState::GetNumStagesMultiplierForSong( WID.m_pSong );
}
else if( WID.m_pCourse != NULL )
{