From 9fea98296b3f7d48ecbe1d74915c54d1ff5eda80 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Tue, 30 Apr 2013 22:14:36 -0400 Subject: [PATCH] Just two here. --- src/ScreenOptionsMaster.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ScreenOptionsMaster.cpp b/src/ScreenOptionsMaster.cpp index 039450739c..7080b9371c 100644 --- a/src/ScreenOptionsMaster.cpp +++ b/src/ScreenOptionsMaster.cpp @@ -69,8 +69,8 @@ void ScreenOptionsMaster::Init() void ScreenOptionsMaster::ImportOptions( int r, const vector &vpns ) { - FOREACH_CONST( PlayerNumber, vpns, pn ) - ASSERT( GAMESTATE->IsHumanPlayer(*pn) ); + for (PlayerNumber const &pn : vpns) + ASSERT( GAMESTATE->IsHumanPlayer(pn) ); OptionRow &row = *m_pRows[r]; row.ImportOptions( vpns ); } @@ -82,10 +82,10 @@ void ScreenOptionsMaster::ExportOptions( int r, const vector &vpns OptionRow &row = *m_pRows[r]; bool bRowHasFocus[NUM_PLAYERS]; ZERO( bRowHasFocus ); - FOREACH_CONST( PlayerNumber, vpns, p ) + for (PlayerNumber const &p : vpns) { - int iCurRow = m_iCurrentRow[*p]; - bRowHasFocus[*p] = iCurRow == r; + int iCurRow = m_iCurrentRow[p]; + bRowHasFocus[p] = iCurRow == r; } m_iChangeMask |= row.ExportOptions( vpns, bRowHasFocus ); }