Just two here.
This commit is contained in:
@@ -69,8 +69,8 @@ void ScreenOptionsMaster::Init()
|
||||
|
||||
void ScreenOptionsMaster::ImportOptions( int r, const vector<PlayerNumber> &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<PlayerNumber> &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 );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user