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

Oh joy: THIS file.

Browse Source 
Take advantage of auto whenever possible.
This commit is contained in:
Jason Felds
2013-05-01 23:23:08 -04:00
parent bf2f771fd1
commit 1707d5d044
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenEdit.cpp
+20 -18
View File
@@ -2405,12 +2405,12 @@ bool ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
// Fill in lines enabled/disabled // Fill in lines enabled/disabled
bool bAlreadyBGChangeHere = false; bool bAlreadyBGChangeHere = false;
BackgroundChange bgChange; BackgroundChange bgChange;
FOREACH( BackgroundChange, m_pSong->GetBackgroundChanges(g_CurrentBGChangeLayer), bgc ) for (BackgroundChange &bgc : m_pSong->GetBackgroundChanges(g_CurrentBGChangeLayer))
{ {
if( bgc->m_fStartBeat == GAMESTATE->m_pPlayerState[PLAYER_1]->m_Position.m_fSongBeat ) if( bgc.m_fStartBeat == GAMESTATE->m_pPlayerState[PLAYER_1]->m_Position.m_fSongBeat )
{ {
bAlreadyBGChangeHere = true; bAlreadyBGChangeHere = true;
bgChange = *bgc; bgChange = bgc;
} }
} }
@@ -2628,12 +2628,13 @@ bool ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
BackgroundLayer iLayer = BACKGROUND_LAYER_1; BackgroundLayer iLayer = BACKGROUND_LAYER_1;
BackgroundChange bgChange; BackgroundChange bgChange;
bgChange.m_fStartBeat = GAMESTATE->m_Position.m_fSongBeat; bgChange.m_fStartBeat = GAMESTATE->m_Position.m_fSongBeat;
FOREACH( BackgroundChange, m_pSong->GetBackgroundChanges(iLayer), bgc ) auto & changes = m_pSong->GetBackgroundChanges(iLayer);
for (auto bgc = changes.begin(); bgc != changes.end(); ++bgc)
{ {
if( bgc->m_fStartBeat == GAMESTATE->m_Position.m_fSongBeat ) if( bgc->m_fStartBeat == GAMESTATE->m_Position.m_fSongBeat )
{ {
bgChange = *bgc; bgChange = *bgc;
m_pSong->GetBackgroundChanges(iLayer).erase( bgc ); changes.erase( bgc );
break; break;
} }
} }
@@ -5388,13 +5389,14 @@ void ScreenEdit::HandleBGChangeChoice( BGChangeChoice c, const vector<int> &iAns
{ {
BackgroundChange newChange; BackgroundChange newChange;
FOREACH( BackgroundChange, m_pSong->GetBackgroundChanges(g_CurrentBGChangeLayer), iter ) auto &changes = m_pSong->GetBackgroundChanges(g_CurrentBGChangeLayer);
for (auto iter = changes.begin(); iter != changes.end(); ++iter)
{ {
if( iter->m_fStartBeat == GAMESTATE->m_Position.m_fSongBeat ) if( iter->m_fStartBeat == GAMESTATE->m_Position.m_fSongBeat )
{ {
newChange = *iter; newChange = *iter;
// delete the old change. We'll add a new one below. // delete the old change. We'll add a new one below.
m_pSong->GetBackgroundChanges(g_CurrentBGChangeLayer).erase( iter ); changes.erase( iter );
break; break;
} }
} }
@@ -5489,8 +5491,8 @@ void ScreenEdit::SetupCourseAttacks()
} }
} }
FOREACH( Attack, Attacks, attack ) for (Attack &attack: Attacks)
GAMESTATE->m_pPlayerState[PLAYER_1]->LaunchAttack( *attack ); GAMESTATE->m_pPlayerState[PLAYER_1]->LaunchAttack( attack );
} }
else else
{ {
@@ -5503,11 +5505,11 @@ void ScreenEdit::SetupCourseAttacks()
if (attacks.size() > 0) if (attacks.size() > 0)
{ {
FOREACH(Attack, attacks, attack) for (Attack &attack : attacks)
{ {
float fBeat = GetAppropriateTiming().GetBeatFromElapsedTime(attack->fStartSecond); float fBeat = GetAppropriateTiming().GetBeatFromElapsedTime(attack.fStartSecond);
if (fBeat >= GetBeat()) if (fBeat >= GetBeat())
GAMESTATE->m_pPlayerState[PLAYER_1]->LaunchAttack( *attack ); GAMESTATE->m_pPlayerState[PLAYER_1]->LaunchAttack( attack );
} }
} }
} }
@@ -5760,8 +5762,8 @@ static void ProcessKeyName( RString &s )
static void ProcessKeyNames( vector<RString> &vs ) static void ProcessKeyNames( vector<RString> &vs )
{ {
FOREACH( RString, vs, s ) for (RString &s : vs)
ProcessKeyName( *s ); ProcessKeyName( s );
sort( vs.begin(), vs.end() ); sort( vs.begin(), vs.end() );
vector<RString>::iterator toDelete = unique( vs.begin(), vs.end() ); vector<RString>::iterator toDelete = unique( vs.begin(), vs.end() );
@@ -5808,9 +5810,9 @@ void ScreenEdit::DoStepAttackMenu()
g_AttackAtTimeMenu.rows.clear(); g_AttackAtTimeMenu.rows.clear();
unsigned index = 0; unsigned index = 0;
FOREACH(int, points, i) for (int &i : points)
{ {
const Attack &attack = attacks[*i]; const Attack &attack = attacks[i];
RString desc = ssprintf("%g -> %g (%d mod[s])", RString desc = ssprintf("%g -> %g (%d mod[s])",
startTime, startTime + attack.fSecsRemaining, startTime, startTime + attack.fSecsRemaining,
attack.GetNumAttacks()); attack.GetNumAttacks());
@@ -5847,9 +5849,9 @@ void ScreenEdit::DoKeyboardTrackMenu()
vector<RString> &kses = m_pSong->m_vsKeysoundFile; vector<RString> &kses = m_pSong->m_vsKeysoundFile;
vector<RString> choices; vector<RString> choices;
FOREACH(RString, kses, ks) for (RString const &ks : kses)
{ {
choices.push_back(*ks); choices.push_back(ks);
} }
choices.push_back(NEWKEYSND); choices.push_back(NEWKEYSND);
choices.push_back(NO_KEYSND); choices.push_back(NO_KEYSND);