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

Good number of loops here.

Browse Source
This commit is contained in:
Jason Felds
2013-05-01 22:23:49 -04:00
parent 792ecf427d
commit 93ab2afccc
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Song.cpp
+16 -11
View File
@@ -86,8 +86,10 @@ Song::Song()
Song::~Song() Song::~Song()
{ {
FOREACH( Steps*, m_vpSteps, s ) for (Steps *s : m_vpSteps)
SAFE_DELETE( *s ); {
SAFE_DELETE( s );
}
m_vpSteps.clear(); m_vpSteps.clear();
// It's the responsibility of the owner of this Song to make sure // It's the responsibility of the owner of this Song to make sure
@@ -149,8 +151,10 @@ void Song::SetSpecifiedLastSecond(const float f)
// Reset to an empty song. // Reset to an empty song.
void Song::Reset() void Song::Reset()
{ {
FOREACH( Steps*, m_vpSteps, s ) for (Steps *s : m_vpSteps)
SAFE_DELETE( *s ); {
SAFE_DELETE( s );
}
m_vpSteps.clear(); m_vpSteps.clear();
FOREACH_ENUM( StepsType, st ) FOREACH_ENUM( StepsType, st )
m_vpStepsByType[st].clear(); m_vpStepsByType[st].clear();
@@ -166,7 +170,8 @@ void Song::Reset()
void Song::AddBackgroundChange( BackgroundLayer iLayer, BackgroundChange seg ) void Song::AddBackgroundChange( BackgroundLayer iLayer, BackgroundChange seg )
{ {
// Delete old background change at this start beat, if any. // Delete old background change at this start beat, if any.
FOREACH( BackgroundChange, GetBackgroundChanges(iLayer), bgc ) auto &changes = GetBackgroundChanges(iLayer);
for (vector<BackgroundChange>::iterator bgc = changes.begin(); bgc != changes.end(); ++bgc)
{ {
if( bgc->m_fStartBeat == seg.m_fStartBeat ) if( bgc->m_fStartBeat == seg.m_fStartBeat )
{ {
@@ -334,11 +339,11 @@ bool Song::LoadFromSongDir( RString sDir )
sCacheFilePath = RString(); sCacheFilePath = RString();
} }
FOREACH( Steps*, m_vpSteps, s ) for (Steps *s : m_vpSteps)
{ {
/* Compress all Steps. During initial caching, this will remove cached /* Compress all Steps. During initial caching, this will remove cached
* NoteData; during cached loads, this will just remove cached SMData. */ * NoteData; during cached loads, this will just remove cached SMData. */
(*s)->Compress(); s->Compress();
} }
// Load the cached banners, if it's not loaded already. // Load the cached banners, if it's not loaded already.
@@ -539,9 +544,9 @@ void Song::TidyUpData( bool fromCache, bool /* duringCache */ )
m_SongTiming.TidyUpData( false ); m_SongTiming.TidyUpData( false );
FOREACH( Steps *, m_vpSteps, s ) for (Steps *s : m_vpSteps)
{ {
(*s)->m_Timing.TidyUpData( true ); s->m_Timing.TidyUpData( true );
} }
/* Generate these before we autogen notes, so the new notes can inherit /* Generate these before we autogen notes, so the new notes can inherit
@@ -1041,8 +1046,8 @@ bool Song::SaveToSSCFile( RString sPath, bool bSavingCache )
} }
// Mark these steps saved to disk. // Mark these steps saved to disk.
FOREACH( Steps*, vpStepsToSave, s ) for (Steps *s : vpStepsToSave)
(*s)->SetSavedToDisk( true ); s->SetSavedToDisk( true );
return true; return true;
} }