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

Lots of loops and a goodie here.

Browse Source 
I wonder if the last one could be used as a goodie.
This commit is contained in:
Jason Felds
2013-04-28 23:24:59 -04:00
parent b3126e1705
commit de92c9ae45
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Song.cpp
+13 -11
View File
@@ -968,9 +968,8 @@ bool Song::SaveToSMFile()
FileCopy( sPath, sPath + ".old" ); FileCopy( sPath, sPath + ".old" );
vector<Steps*> vpStepsToSave; vector<Steps*> vpStepsToSave;
FOREACH_CONST( Steps*, m_vpSteps, s ) for (Steps *pSteps : m_vpSteps)
{ {
Steps *pSteps = *s;
if( pSteps->IsAutogen() ) if( pSteps->IsAutogen() )
continue; // don't write autogen notes continue; // don't write autogen notes
@@ -998,9 +997,8 @@ bool Song::SaveToSSCFile( RString sPath, bool bSavingCache )
FileCopy( path, path + ".old" ); FileCopy( path, path + ".old" );
vector<Steps*> vpStepsToSave; vector<Steps*> vpStepsToSave;
FOREACH_CONST( Steps*, m_vpSteps, s ) for (Steps *pSteps : m_vpSteps)
{ {
Steps *pSteps = *s;
if( pSteps->IsAutogen() ) if( pSteps->IsAutogen() )
continue; // don't write autogen notes continue; // don't write autogen notes
@@ -1192,11 +1190,11 @@ bool Song::IsEasy( StepsType st ) const
bool Song::IsTutorial() const bool Song::IsTutorial() const
{ {
// A Song is considered a Tutorial if it has only Beginner steps. // A Song is considered a Tutorial if it has only Beginner steps.
FOREACH_CONST( Steps*, m_vpSteps, s ) for (Steps const *s : m_vpSteps)
{ {
if( (*s)->m_StepsType == StepsType_lights_cabinet ) if( s->m_StepsType == StepsType_lights_cabinet )
continue; // ignore continue; // ignore
if( (*s)->GetDifficulty() != Difficulty_Beginner ) if( s->GetDifficulty() != Difficulty_Beginner )
return false; return false;
} }
@@ -1205,9 +1203,9 @@ bool Song::IsTutorial() const
bool Song::HasEdits( StepsType st ) const bool Song::HasEdits( StepsType st ) const
{ {
for( unsigned i=0; i<m_vpSteps.size(); i++ ) #ifdef MACOSX
for (Steps const *pSteps : m_vpSteps)
{ {
Steps* pSteps = m_vpSteps[i];
if( pSteps->m_StepsType == st && if( pSteps->m_StepsType == st &&
pSteps->GetDifficulty() == Difficulty_Edit ) pSteps->GetDifficulty() == Difficulty_Edit )
{ {
@@ -1216,6 +1214,10 @@ bool Song::HasEdits( StepsType st ) const
} }
return false; return false;
#else
return std::any_of(m_vpSteps.begin(), m_vpSteps.end(),
[&](Steps const *step) { return step->m_StepsType == st && step->GetDifficulty() == Difficulty_Edit; });
#endif
} }
bool Song::NormallyDisplayed() const bool Song::NormallyDisplayed() const
@@ -1303,9 +1305,9 @@ vector<BackgroundChange> &Song::GetForegroundChanges()
vector<RString> Song::GetChangesToVectorString(const vector<BackgroundChange> & changes) const vector<RString> Song::GetChangesToVectorString(const vector<BackgroundChange> & changes) const
{ {
vector<RString> ret; vector<RString> ret;
FOREACH_CONST( BackgroundChange, changes, bgc ) for (BackgroundChange const &bgc : changes)
{ {
ret.push_back((*bgc).ToString()); ret.push_back(bgc.ToString());
} }
return ret; return ret;
} }