From 6b4cd234acc88223f280abc38b8c0aa0595d2c45 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 29 Apr 2013 23:58:43 -0400 Subject: [PATCH] More loops. --- src/ScreenGameplay.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp index 13a186c11d..ed137362fc 100644 --- a/src/ScreenGameplay.cpp +++ b/src/ScreenGameplay.cpp @@ -820,10 +820,10 @@ void ScreenGameplay::InitSongQueues() PlayerNumber pnMaster = GAMESTATE->GetMasterPlayerNumber(); Trail *pTrail = GAMESTATE->m_pCurTrail[pnMaster]; ASSERT( pTrail != NULL ); - FOREACH_CONST( TrailEntry, pTrail->m_vEntries, e ) + for (TrailEntry const &e : pTrail->m_vEntries) { - ASSERT( e->pSong != NULL ); - m_apSongsQueue.push_back( e->pSong ); + ASSERT( e.pSong != NULL ); + m_apSongsQueue.push_back( e.pSong ); } FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi ) @@ -833,12 +833,12 @@ void ScreenGameplay::InitSongQueues() pi->m_vpStepsQueue.clear(); pi->m_asModifiersQueue.clear(); - FOREACH_CONST( TrailEntry, lTrail->m_vEntries, e ) + for (TrailEntry const &e : lTrail->m_vEntries) { - ASSERT( e->pSteps != NULL ); - pi->m_vpStepsQueue.push_back( e->pSteps ); + ASSERT( e.pSteps != NULL ); + pi->m_vpStepsQueue.push_back( e.pSteps ); AttackArray a; - e->GetAttackArray( a ); + e.GetAttackArray( a ); pi->m_asModifiersQueue.push_back( a ); }