Much simpler implementations for the loops.

Who needs iterators?
This commit is contained in:
Jason Felds
2013-05-01 22:08:23 -04:00
parent 9aef74918f
commit bec4640ee3
+7 -7
View File
@@ -61,9 +61,9 @@ void AdjustSync::ResetOriginalSyncData()
{ {
s_vpTimingDataOriginal.push_back(GAMESTATE->m_pCurSong->m_SongTiming); s_vpTimingDataOriginal.push_back(GAMESTATE->m_pCurSong->m_SongTiming);
const vector<Steps *>& vpSteps = GAMESTATE->m_pCurSong->GetAllSteps(); const vector<Steps *>& vpSteps = GAMESTATE->m_pCurSong->GetAllSteps();
FOREACH( Steps*, const_cast<vector<Steps *>&>(vpSteps), s ) for (Steps const *s : vpSteps)
{ {
s_vpTimingDataOriginal.push_back((*s)->m_Timing); s_vpTimingDataOriginal.push_back(s->m_Timing);
} }
} }
else else
@@ -128,9 +128,9 @@ void AdjustSync::RevertSyncChanges()
unsigned location = 1; unsigned location = 1;
const vector<Steps *>& vpSteps = GAMESTATE->m_pCurSong->GetAllSteps(); const vector<Steps *>& vpSteps = GAMESTATE->m_pCurSong->GetAllSteps();
FOREACH( Steps*, const_cast<vector<Steps *>&>(vpSteps), s ) for (Steps *s : vpSteps)
{ {
(*s)->m_Timing = s_vpTimingDataOriginal[location]; s->m_Timing = s_vpTimingDataOriginal[location];
location++; location++;
} }
@@ -214,13 +214,13 @@ void AdjustSync::AutosyncOffset()
{ {
GAMESTATE->m_pCurSong->m_SongTiming.m_fBeat0OffsetInSeconds += mean; GAMESTATE->m_pCurSong->m_SongTiming.m_fBeat0OffsetInSeconds += mean;
const vector<Steps *>& vpSteps = GAMESTATE->m_pCurSong->GetAllSteps(); const vector<Steps *>& vpSteps = GAMESTATE->m_pCurSong->GetAllSteps();
FOREACH( Steps*, const_cast<vector<Steps *>&>(vpSteps), s ) for (Steps *s : vpSteps)
{ {
// Empty TimingData means it's inherited // Empty TimingData means it's inherited
// from the song and is already changed. // from the song and is already changed.
if( (*s)->m_Timing.empty() ) if( s->m_Timing.empty() )
continue; continue;
(*s)->m_Timing.m_fBeat0OffsetInSeconds += mean; s->m_Timing.m_fBeat0OffsetInSeconds += mean;
} }
break; break;
} }