From 71cb277d840953af31f99f5089402c6a3fa8e559 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 18 Jan 2006 04:10:31 +0000 Subject: [PATCH] InitText automatically --- stepmania/src/OptionRow.cpp | 4 ++++ stepmania/src/ScreenOptions.cpp | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp index a7bcfbb0ba..630882c8a7 100644 --- a/stepmania/src/OptionRow.cpp +++ b/stepmania/src/OptionRow.cpp @@ -180,6 +180,8 @@ void OptionRow::LoadNormal( OptionRowHandler *pHand, bool bFirstItemGoesDown ) FOREACH_PlayerNumber( p ) m_vbSelected[p].insert( m_vbSelected[p].begin(), false ); } + + InitText(); } CString OptionRow::GetRowTitle() const @@ -498,6 +500,8 @@ void OptionRow::LoadExit() vector &vbSelected = m_vbSelected[p]; vbSelected.resize( m_pHand->m_Def.m_vsChoices.size(), false ); } + + InitText(); } void OptionRow::PositionUnderlines( PlayerNumber pn ) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index a2089ff9cd..1a0c87e03a 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -217,7 +217,6 @@ void ScreenOptions::InitMenu( const vector &vHands ) bool bFirstRowGoesDown = m_OptionsNavigation==NAV_TOGGLE_THREE_KEY; row.LoadNormal( vHands[r], bFirstRowGoesDown ); - row.InitText(); } if( SHOW_EXIT_ROW ) @@ -225,7 +224,6 @@ void ScreenOptions::InitMenu( const vector &vHands ) m_pRows.push_back( new OptionRow(&m_OptionRowType) ); OptionRow &row = *m_pRows.back(); row.LoadExit(); - row.InitText(); row.SetDrawOrder( 1 ); m_framePage.AddChild( &row ); }