Just two here.

This commit is contained in:
Jason Felds
2013-04-30 22:47:28 -04:00
parent bb634d57ac
commit de6515ddf5
+8 -8
View File
@@ -24,13 +24,13 @@ REGISTER_SCREEN_CLASS( ScreenHighScores );
static void GetAllSongsToShow( vector<Song*> &vpOut, int iNumMostRecentScoresToShow ) static void GetAllSongsToShow( vector<Song*> &vpOut, int iNumMostRecentScoresToShow )
{ {
vpOut.clear(); vpOut.clear();
FOREACH_CONST( Song*, SONGMAN->GetAllSongs(), s ) for (Song *s : SONGMAN->GetAllSongs())
{ {
if( !(*s)->NormallyDisplayed() ) if( !s->NormallyDisplayed() )
continue; // skip continue; // skip
if( !(*s)->ShowInDemonstrationAndRanking() ) if( !s->ShowInDemonstrationAndRanking() )
continue; // skip continue; // skip
vpOut.push_back( *s ); vpOut.push_back( s );
} }
if( (int)vpOut.size() > iNumMostRecentScoresToShow ) if( (int)vpOut.size() > iNumMostRecentScoresToShow )
@@ -51,13 +51,13 @@ static void GetAllCoursesToShow( vector<Course*> &vpOut, CourseType ct, int iNum
else else
SONGMAN->GetCourses( ct, vpCourses, false ); SONGMAN->GetCourses( ct, vpCourses, false );
FOREACH_CONST( Course*, vpCourses, c) for (Course *c : vpCourses)
{ {
if( UNLOCKMAN->CourseIsLocked(*c) ) if( UNLOCKMAN->CourseIsLocked(c) )
continue; // skip continue; // skip
if( !(*c)->ShowInDemonstrationAndRanking() ) if( !c->ShowInDemonstrationAndRanking() )
continue; // skip continue; // skip
vpOut.push_back( *c ); vpOut.push_back( c );
} }
if( (int)vpOut.size() > iNumMostRecentScoresToShow ) if( (int)vpOut.size() > iNumMostRecentScoresToShow )
{ {