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

Replace most loops, remove one unneeded loop.

Browse Source
This commit is contained in:
Jason Felds
2013-04-28 18:08:09 -04:00
parent 9f431955f3
commit cbe8d8bf55
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/OptionRow.cpp
+14 -18
View File
@@ -63,8 +63,8 @@ void OptionRow::Clear()
if( m_pHand != NULL ) if( m_pHand != NULL )
{ {
FOREACH_CONST( RString, m_pHand->m_vsReloadRowMessages, m ) for (RString const &m : m_pHand->m_vsReloadRowMessages)
MESSAGEMAN->Unsubscribe( this, *m ); MESSAGEMAN->Unsubscribe( this, m );
} }
SAFE_DELETE( m_pHand ); SAFE_DELETE( m_pHand );
@@ -125,8 +125,8 @@ void OptionRow::LoadNormal( OptionRowHandler *pHand, bool bFirstItemGoesDown )
m_pHand = pHand; m_pHand = pHand;
m_bFirstItemGoesDown = bFirstItemGoesDown; m_bFirstItemGoesDown = bFirstItemGoesDown;
FOREACH_CONST( RString, m_pHand->m_vsReloadRowMessages, m ) for (RString const &m : m_pHand->m_vsReloadRowMessages)
MESSAGEMAN->Subscribe( this, *m ); MESSAGEMAN->Subscribe( this, m );
ChoicesChanged( RowType_Normal ); ChoicesChanged( RowType_Normal );
} }
@@ -857,10 +857,13 @@ void OptionRow::Reload()
void OptionRow::HandleMessage( const Message &msg ) void OptionRow::HandleMessage( const Message &msg )
{ {
bool bReload = false; bool bReload = false;
FOREACH_CONST( RString, m_pHand->m_vsReloadRowMessages, m ) for (RString const &m : m_pHand->m_vsReloadRowMessages)
{
if( m == msg.GetName() )
{ {
if( *m == msg.GetName() )
bReload = true; bReload = true;
break;
}
} }
if( bReload ) if( bReload )
Reload(); Reload();
@@ -882,12 +885,9 @@ void OptionRow::ImportOptions( const vector<PlayerNumber> &vpns )
{ {
ASSERT( m_pHand->m_Def.m_vsChoices.size() > 0 ); ASSERT( m_pHand->m_Def.m_vsChoices.size() > 0 );
FOREACH_CONST( PlayerNumber, vpns, iter ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *iter; std::fill_n(m_vbSelected[p].begin(), m_vbSelected[p].size(), false);
FOREACH( bool, m_vbSelected[p], b )
*b = false;
ASSERT( m_vbSelected[p].size() == m_pHand->m_Def.m_vsChoices.size() ); ASSERT( m_vbSelected[p].size() == m_pHand->m_Def.m_vsChoices.size() );
ERASE_ONE_BOOL_AT_FRONT_IF_NEEDED( m_vbSelected[p] ); ERASE_ONE_BOOL_AT_FRONT_IF_NEEDED( m_vbSelected[p] );
@@ -895,10 +895,8 @@ void OptionRow::ImportOptions( const vector<PlayerNumber> &vpns )
m_pHand->ImportOption( this, vpns, m_vbSelected ); m_pHand->ImportOption( this, vpns, m_vbSelected );
FOREACH_CONST( PlayerNumber, vpns, iter ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *iter;
INSERT_ONE_BOOL_AT_FRONT_IF_NEEDED( m_vbSelected[p] ); INSERT_ONE_BOOL_AT_FRONT_IF_NEEDED( m_vbSelected[p] );
VerifySelected( m_pHand->m_Def.m_selectType, m_vbSelected[p], m_pHand->m_Def.m_sName ); VerifySelected( m_pHand->m_Def.m_selectType, m_vbSelected[p], m_pHand->m_Def.m_sName );
} }
@@ -910,9 +908,8 @@ int OptionRow::ExportOptions( const vector<PlayerNumber> &vpns, bool bRowHasFocu
int iChangeMask = 0; int iChangeMask = 0;
FOREACH_CONST( PlayerNumber, vpns, iter ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *iter;
bool bFocus = bRowHasFocus[p]; bool bFocus = bRowHasFocus[p];
VerifySelected( m_pHand->m_Def.m_selectType, m_vbSelected[p], m_pHand->m_Def.m_sName ); VerifySelected( m_pHand->m_Def.m_selectType, m_vbSelected[p], m_pHand->m_Def.m_sName );
@@ -927,9 +924,8 @@ int OptionRow::ExportOptions( const vector<PlayerNumber> &vpns, bool bRowHasFocu
iChangeMask |= m_pHand->ExportOption( vpns, m_vbSelected ); iChangeMask |= m_pHand->ExportOption( vpns, m_vbSelected );
FOREACH_CONST( PlayerNumber, vpns, iter ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *iter;
bool bFocus = bRowHasFocus[p]; bool bFocus = bRowHasFocus[p];
int iChoice = GetChoiceInRowWithFocus( p ); int iChoice = GetChoiceInRowWithFocus( p );