Another two.

This commit is contained in:
Jason Felds
2013-04-30 21:57:33 -04:00
parent 9a0f7a93e2
commit a1f671d06f
+7 -7
View File
@@ -40,14 +40,14 @@ public:
if( pSong ) // playing a song if( pSong ) // playing a song
{ {
GetStepsForSong( pSong, m_vpSteps ); GetStepsForSong( pSong, m_vpSteps );
FOREACH_CONST( Steps*, m_vpSteps, steps ) for (Steps const *steps : m_vpSteps)
{ {
RString s; RString s;
if( (*steps)->GetDifficulty() == Difficulty_Edit ) if( steps->GetDifficulty() == Difficulty_Edit )
s = (*steps)->GetDescription(); s = steps->GetDescription();
else else
s = CustomDifficultyToLocalizedString( StepsToCustomDifficulty(*steps) ); s = CustomDifficultyToLocalizedString( StepsToCustomDifficulty(steps) );
s += ssprintf( " %d", (*steps)->GetMeter() ); s += ssprintf( " %d", steps->GetMeter() );
m_Def.m_vsChoices.push_back( s ); m_Def.m_vsChoices.push_back( s );
} }
m_Def.m_vEnabledForPlayers.clear(); m_Def.m_vEnabledForPlayers.clear();
@@ -201,8 +201,8 @@ void ScreenOptionsEditCourse::BeginScreen()
{ {
{ {
MenuRowDef mrd = MenuRowDef( -1, "---", true, EditMode_Practice, true, false, 0, EMPTY.GetValue() ); MenuRowDef mrd = MenuRowDef( -1, "---", true, EditMode_Practice, true, false, 0, EMPTY.GetValue() );
FOREACH_CONST( Song*, m_vpSongs, s ) for (Song const *s : m_vpSongs)
mrd.choices.push_back( (*s)->GetDisplayFullTitle() ); mrd.choices.push_back( s->GetDisplayFullTitle() );
mrd.sName = ssprintf(SONG.GetValue() + " %d",i+1); mrd.sName = ssprintf(SONG.GetValue() + " %d",i+1);
OptionRowHandler *pHand = OptionRowHandlerUtil::MakeSimple( mrd ); OptionRowHandler *pHand = OptionRowHandlerUtil::MakeSimple( mrd );
pHand->m_Def.m_bAllowThemeTitle = false; // already themed pHand->m_Def.m_bAllowThemeTitle = false; // already themed