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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenHighScores.cpp
+19 -19
View File
@@ -24,13 +24,13 @@ REGISTER_SCREEN_CLASS( ScreenHighScores );
static void GetAllSongsToShow( vector<Song*> &vpOut, int iNumMostRecentScoresToShow )
{
vpOut.clear();
FOREACH_CONST( Song*, SONGMAN->GetAllSongs(), s )
for (Song *s : SONGMAN->GetAllSongs())
{
if( !(*s)->NormallyDisplayed() )
if( !s->NormallyDisplayed() )
continue; // skip
if( !(*s)->ShowInDemonstrationAndRanking() )
if( !s->ShowInDemonstrationAndRanking() )
continue; // skip
vpOut.push_back( *s );
vpOut.push_back( s );
}
if( (int)vpOut.size() > iNumMostRecentScoresToShow )
@@ -51,13 +51,13 @@ static void GetAllCoursesToShow( vector<Course*> &vpOut, CourseType ct, int iNum
else
SONGMAN->GetCourses( ct, vpCourses, false );
FOREACH_CONST( Course*, vpCourses, c)
for (Course *c : vpCourses)
{
if( UNLOCKMAN->CourseIsLocked(*c) )
if( UNLOCKMAN->CourseIsLocked(c) )
continue; // skip
if( !(*c)->ShowInDemonstrationAndRanking() )
if( !c->ShowInDemonstrationAndRanking() )
continue; // skip
vpOut.push_back( *c );
vpOut.push_back( c );
}
if( (int)vpOut.size() > iNumMostRecentScoresToShow )
{
@@ -116,9 +116,9 @@ void ScoreScroller::ConfigureActor( Actor *pActor, int iItem )
const ScoreRowItemData &data = m_vScoreRowItemData[iItem];
Message msg("Set");
if( data.m_pSong != NULL )
if( data.m_pSong != nullptr )
msg.SetParam( "Song", data.m_pSong );
if( data.m_pCourse != NULL )
if( data.m_pCourse != nullptr )
msg.SetParam( "Course", data.m_pCourse );
@@ -127,27 +127,27 @@ void ScoreScroller::ConfigureActor( Actor *pActor, int iItem )
lua_pushvalue( L, -1 );
msg.SetParamFromStack( L, "Entries" );
FOREACH( DifficultyAndStepsType, m_DifficultiesToShow, iter )
int i = 0;
for (DifficultyAndStepsType &iter : m_DifficultiesToShow)
{
int i = iter-m_DifficultiesToShow.begin();
Difficulty dc = iter->first;
StepsType st = iter->second;
Difficulty dc = iter.first;
StepsType st = iter.second;
if( data.m_pSong != NULL )
if( data.m_pSong != nullptr )
{
const Song* pSong = data.m_pSong;
Steps *pSteps = SongUtil::GetStepsByDifficulty( pSong, st, dc, false );
if( pSteps && UNLOCKMAN->StepsIsLocked(pSong, pSteps) )
pSteps = NULL;
pSteps = nullptr;
LuaHelpers::Push( L, pSteps );
}
else if( data.m_pCourse != NULL )
else if( data.m_pCourse != nullptr )
{
const Course* pCourse = data.m_pCourse;
Trail *pTrail = pCourse->GetTrail( st, dc );
LuaHelpers::Push( L, pTrail );
}
// Because pSteps or pTrail can be NULL, what we're creating in Lua is not an array.
// Because pSteps or pTrail can be nullptr, what we're creating in Lua is not an array.
// It must be iterated using pairs(), not ipairs().
lua_setfield( L, -2, ssprintf("%d",i+1) );
}
@@ -187,7 +187,7 @@ void ScoreScroller::Load( RString sMetricsGroup )
for( int i=0; i<iNumCopies; ++i )
{
Actor *pActor = ActorUtil::MakeActor( THEME->GetPathG(sMetricsGroup,"ScrollerItem") );
if( pActor != NULL )
if( pActor != nullptr )
this->AddChild( pActor );
}