From e2ea061fdc9144bcba01edf75f68a483520878fd Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Tue, 30 Apr 2013 20:40:42 -0400 Subject: [PATCH] Quickie loops. --- src/GameState.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/GameState.cpp b/src/GameState.cpp index d1ac03ea86..f93e484352 100644 --- a/src/GameState.cpp +++ b/src/GameState.cpp @@ -1426,10 +1426,10 @@ void GameState::GetAllUsedNoteSkins( vector &out ) const const Trail *pTrail = m_pCurTrail[pn]; ASSERT( pTrail != NULL ); - FOREACH_CONST( TrailEntry, pTrail->m_vEntries, e ) + for (TrailEntry const &e : pTrail->m_vEntries) { PlayerOptions po; - po.FromString( e->Modifiers ); + po.FromString( e.Modifiers ); if( !po.m_sNoteSkin.empty() ) out.push_back( po.m_sNoteSkin ); } @@ -1930,15 +1930,15 @@ Difficulty GameState::GetClosestShownDifficulty( PlayerNumber pn ) const Difficulty iClosest = (Difficulty) 0; int iClosestDist = -1; - FOREACH_CONST( Difficulty, v, dc ) + for (Difficulty const &dc : v) { - int iDist = m_PreferredDifficulty[pn] - *dc; + int iDist = m_PreferredDifficulty[pn] - dc; if( iDist < 0 ) continue; if( iClosestDist != -1 && iDist > iClosestDist ) continue; iClosestDist = iDist; - iClosest = *dc; + iClosest = dc; } return iClosest;