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

More for loops.

Browse Source
This commit is contained in:
Jason Felds
2013-04-30 19:38:43 -04:00
parent 8ff71f01f8
commit 860b32da7c
1 changed files with 1429 additions and 1438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/OptionRowHandler.cpp
+28 -37
View File
@@ -237,9 +237,8 @@ public:
} }
void ImportOption( OptionRow *pRow, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const void ImportOption( OptionRow *pRow, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const
{ {
FOREACH_CONST( PlayerNumber, vpns, pn ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *pn;
vector<bool> &vbSelOut = vbSelectedOut[p]; vector<bool> &vbSelOut = vbSelectedOut[p];
bool bUseFallbackOption = true; bool bUseFallbackOption = true;
@@ -303,9 +302,8 @@ public:
int ExportOption( const vector<PlayerNumber> &vpns, const vector<bool> vbSelected[NUM_PLAYERS] ) const int ExportOption( const vector<PlayerNumber> &vpns, const vector<bool> vbSelected[NUM_PLAYERS] ) const
{ {
FOREACH_CONST( PlayerNumber, vpns, pn ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *pn;
const vector<bool> &vbSel = vbSelected[p]; const vector<bool> &vbSel = vbSelected[p];
m_Default.Apply( p ); m_Default.Apply( p );
@@ -315,8 +313,8 @@ public:
m_aListEntries[i].Apply( p ); m_aListEntries[i].Apply( p );
} }
} }
FOREACH_CONST( RString, m_vsBroadcastOnExport, s ) for (RString const &s : m_vsBroadcastOnExport)
MESSAGEMAN->Broadcast( *s ); MESSAGEMAN->Broadcast( s );
return 0; return 0;
} }
@@ -608,9 +606,8 @@ public:
} }
virtual void ImportOption( OptionRow *pRow, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const virtual void ImportOption( OptionRow *pRow, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const
{ {
FOREACH_CONST( PlayerNumber, vpns, pn ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *pn;
vector<bool> &vbSelOut = vbSelectedOut[p]; vector<bool> &vbSelOut = vbSelectedOut[p];
ASSERT( m_vSteps.size() == vbSelOut.size() ); ASSERT( m_vSteps.size() == vbSelOut.size() );
@@ -626,7 +623,8 @@ public:
// look for matching difficulty // look for matching difficulty
if( m_pDifficultyToFill ) if( m_pDifficultyToFill )
{ {
FOREACH_CONST( Difficulty, m_vDifficulties, d ) // use the old style for now.
for (vector<Difficulty>::const_iterator d = m_vDifficulties.begin(); d != m_vDifficulties.end(); ++d)
{ {
unsigned i = d - m_vDifficulties.begin(); unsigned i = d - m_vDifficulties.begin();
if( *d == GAMESTATE->m_PreferredDifficulty[0] ) if( *d == GAMESTATE->m_PreferredDifficulty[0] )
@@ -645,9 +643,8 @@ public:
} }
virtual int ExportOption( const vector<PlayerNumber> &vpns, const vector<bool> vbSelected[NUM_PLAYERS] ) const virtual int ExportOption( const vector<PlayerNumber> &vpns, const vector<bool> vbSelected[NUM_PLAYERS] ) const
{ {
FOREACH_CONST( PlayerNumber, vpns, pn ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *pn;
const vector<bool> &vbSel = vbSelected[p]; const vector<bool> &vbSel = vbSelected[p];
int index = OptionRowHandlerUtil::GetOneSelection( vbSel ); int index = OptionRowHandlerUtil::GetOneSelection( vbSel );
@@ -706,11 +703,11 @@ class OptionRowHandlerListStyles: public OptionRowHandlerList
vector<const Style*> vStyles; vector<const Style*> vStyles;
GAMEMAN->GetStylesForGame( GAMESTATE->m_pCurGame, vStyles ); GAMEMAN->GetStylesForGame( GAMESTATE->m_pCurGame, vStyles );
ASSERT( vStyles.size() != 0 ); ASSERT( vStyles.size() != 0 );
FOREACH_CONST( const Style*, vStyles, s ) for (Style const *s : vStyles)
{ {
m_Def.m_vsChoices.push_back( GAMEMAN->StyleToLocalizedString(*s) ); m_Def.m_vsChoices.push_back( GAMEMAN->StyleToLocalizedString(s) );
GameCommand mc; GameCommand mc;
mc.m_pStyle = *s; mc.m_pStyle = s;
m_aListEntries.push_back( mc ); m_aListEntries.push_back( mc );
} }
@@ -738,11 +735,11 @@ class OptionRowHandlerListGroups: public OptionRowHandlerList
m_aListEntries.push_back( mc ); m_aListEntries.push_back( mc );
} }
FOREACH_CONST( RString, vSongGroups, g ) for (RString const &g : vSongGroups)
{ {
m_Def.m_vsChoices.push_back( *g ); m_Def.m_vsChoices.push_back( g );
GameCommand mc; GameCommand mc;
mc.m_sSongGroup = *g; mc.m_sSongGroup = g;
m_aListEntries.push_back( mc ); m_aListEntries.push_back( mc );
} }
} }
@@ -764,15 +761,15 @@ class OptionRowHandlerListDifficulties: public OptionRowHandlerList
m_aListEntries.push_back( mc ); m_aListEntries.push_back( mc );
} }
FOREACH_CONST( Difficulty, CommonMetrics::DIFFICULTIES_TO_SHOW.GetValue(), d ) for (Difficulty const &d : CommonMetrics::DIFFICULTIES_TO_SHOW.GetValue())
{ {
// TODO: Is this the best thing we can do here? // TODO: Is this the best thing we can do here?
StepsType st = GAMEMAN->GetHowToPlayStyleForGame( GAMESTATE->m_pCurGame )->m_StepsType; StepsType st = GAMEMAN->GetHowToPlayStyleForGame( GAMESTATE->m_pCurGame )->m_StepsType;
RString s = CustomDifficultyToLocalizedString( GetCustomDifficulty(st, *d, CourseType_Invalid) ); RString s = CustomDifficultyToLocalizedString( GetCustomDifficulty(st, d, CourseType_Invalid) );
m_Def.m_vsChoices.push_back( s ); m_Def.m_vsChoices.push_back( s );
GameCommand mc; GameCommand mc;
mc.m_dc = *d; mc.m_dc = d;
m_aListEntries.push_back( mc ); m_aListEntries.push_back( mc );
} }
} }
@@ -793,11 +790,11 @@ class OptionRowHandlerListSongsInCurrentSongGroup: public OptionRowHandlerList
m_Def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW; m_Def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
m_Def.m_bExportOnChange = true; m_Def.m_bExportOnChange = true;
FOREACH_CONST( Song*, vpSongs, p ) for (Song *p : vpSongs)
{ {
m_Def.m_vsChoices.push_back( (*p)->GetTranslitFullTitle() ); m_Def.m_vsChoices.push_back( p->GetTranslitFullTitle() );
GameCommand mc; GameCommand mc;
mc.m_pSong = *p; mc.m_pSong = p;
m_aListEntries.push_back( mc ); m_aListEntries.push_back( mc );
} }
} }
@@ -990,9 +987,8 @@ public:
ASSERT( lua_gettop(L) == 0 ); ASSERT( lua_gettop(L) == 0 );
FOREACH_CONST( PlayerNumber, vpns, pn ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *pn;
vector<bool> &vbSelOut = vbSelectedOut[p]; vector<bool> &vbSelOut = vbSelectedOut[p];
/* Evaluate the LoadSelections(self,array,pn) function, where /* Evaluate the LoadSelections(self,array,pn) function, where
@@ -1046,9 +1042,8 @@ public:
ASSERT( lua_gettop(L) == 0 ); ASSERT( lua_gettop(L) == 0 );
FOREACH_CONST( PlayerNumber, vpns, pn ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *pn;
const vector<bool> &vbSel = vbSelected[p]; const vector<bool> &vbSel = vbSelected[p];
/* Evaluate SaveSelections(self,array,pn) function, where array is /* Evaluate SaveSelections(self,array,pn) function, where array is
@@ -1139,9 +1134,8 @@ public:
} }
virtual void ImportOption( OptionRow *, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const virtual void ImportOption( OptionRow *, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const
{ {
FOREACH_CONST( PlayerNumber, vpns, pn ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *pn;
vector<bool> &vbSelOut = vbSelectedOut[p]; vector<bool> &vbSelOut = vbSelectedOut[p];
int iSelection = m_pOpt->Get(); int iSelection = m_pOpt->Get();
@@ -1152,9 +1146,8 @@ public:
{ {
bool bChanged = false; bool bChanged = false;
FOREACH_CONST( PlayerNumber, vpns, pn ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *pn;
const vector<bool> &vbSel = vbSelected[p]; const vector<bool> &vbSel = vbSelected[p];
int iSel = OptionRowHandlerUtil::GetOneSelection(vbSel); int iSel = OptionRowHandlerUtil::GetOneSelection(vbSel);
@@ -1226,9 +1219,9 @@ public:
m_vStepsTypesToShow = CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue(); m_vStepsTypesToShow = CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue();
m_Def.m_vsChoices.clear(); m_Def.m_vsChoices.clear();
FOREACH_CONST( StepsType, m_vStepsTypesToShow, st ) for (StepsType const &st : m_vStepsTypesToShow)
{ {
RString s = GAMEMAN->GetStepsTypeInfo( *st ).GetLocalizedString(); RString s = GAMEMAN->GetStepsTypeInfo( st ).GetLocalizedString();
m_Def.m_vsChoices.push_back( s ); m_Def.m_vsChoices.push_back( s );
} }
@@ -1238,9 +1231,8 @@ public:
virtual void ImportOption( OptionRow *pRow, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const virtual void ImportOption( OptionRow *pRow, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const
{ {
FOREACH_CONST( PlayerNumber, vpns, pn ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *pn;
vector<bool> &vbSelOut = vbSelectedOut[p]; vector<bool> &vbSelOut = vbSelectedOut[p];
if( GAMESTATE->m_pCurSteps[0] ) if( GAMESTATE->m_pCurSteps[0] )
@@ -1259,9 +1251,8 @@ public:
} }
virtual int ExportOption( const vector<PlayerNumber> &vpns, const vector<bool> vbSelected[NUM_PLAYERS] ) const virtual int ExportOption( const vector<PlayerNumber> &vpns, const vector<bool> vbSelected[NUM_PLAYERS] ) const
{ {
FOREACH_CONST( PlayerNumber, vpns, pn ) for (PlayerNumber const &p : vpns)
{ {
PlayerNumber p = *pn;
const vector<bool> &vbSel = vbSelected[p]; const vector<bool> &vbSel = vbSelected[p];
int index = OptionRowHandlerUtil::GetOneSelection( vbSel ); int index = OptionRowHandlerUtil::GetOneSelection( vbSel );