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

Simplify, be explicit.

Browse Source
This commit is contained in:
Jason Felds
2013-04-27 14:00:31 -04:00
parent a11062a29a
commit dfe924a64d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SongUtil.cpp
+5 -5
View File
@@ -963,9 +963,9 @@ void SongUtil::GetPlayableStepsTypes( const Song *pSong, set<StepsType> &vOut )
* stages left to play. */ * stages left to play. */
// this being const may have caused some problems... -aj // this being const may have caused some problems... -aj
const vector<StepsType> &vstToShow = CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue(); const vector<StepsType> &vstToShow = CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue();
FOREACHS( StepsType, vStepsTypes, st ) for (StepsType const &type : vStepsTypes)
{ {
bool bShowThisStepsType = find( vstToShow.begin(), vstToShow.end(), *st ) != vstToShow.end(); bool bShowThisStepsType = find( vstToShow.begin(), vstToShow.end(), type ) != vstToShow.end();
int iNumPlayers = GAMESTATE->GetNumPlayersEnabled(); int iNumPlayers = GAMESTATE->GetNumPlayersEnabled();
iNumPlayers = max( iNumPlayers, 1 ); iNumPlayers = max( iNumPlayers, 1 );
@@ -975,7 +975,7 @@ void SongUtil::GetPlayableStepsTypes( const Song *pSong, set<StepsType> &vOut )
GAMESTATE->GetNumStagesMultiplierForSong(pSong); GAMESTATE->GetNumStagesMultiplierForSong(pSong);
if( bShowThisStepsType && bEnoughStages ) if( bShowThisStepsType && bEnoughStages )
vOut.insert( *st ); vOut.insert( type );
} }
} }
@@ -984,8 +984,8 @@ void SongUtil::GetPlayableSteps( const Song *pSong, vector<Steps*> &vOut )
set<StepsType> vStepsType; set<StepsType> vStepsType;
GetPlayableStepsTypes( pSong, vStepsType ); GetPlayableStepsTypes( pSong, vStepsType );
FOREACHS( StepsType, vStepsType, st ) for (StepsType const &type : vStepsType)
SongUtil::GetSteps( pSong, vOut, *st ); SongUtil::GetSteps( pSong, vOut, type );
StepsUtil::RemoveLockedSteps( pSong, vOut ); StepsUtil::RemoveLockedSteps( pSong, vOut );
StepsUtil::SortNotesArrayByDifficulty( vOut ); StepsUtil::SortNotesArrayByDifficulty( vOut );