From a42ba8e13f1c831ca6dfe72614ceb71974078e83 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 17 Jan 2006 21:40:39 +0000 Subject: [PATCH] simplify --- stepmania/src/OptionRow.cpp | 4 ++-- stepmania/src/OptionRow.h | 2 +- stepmania/src/ScreenOptions.cpp | 5 +---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp index 667d0bf7e9..11e4f94a98 100644 --- a/stepmania/src/OptionRow.cpp +++ b/stepmania/src/OptionRow.cpp @@ -153,9 +153,9 @@ void OptionRowType::Load( const CString &sType ) m_OptionIcon.Load( sType ); } -void OptionRow::LoadNormal( const OptionRowDefinition &def, OptionRowHandler *pHand, bool bFirstItemGoesDown ) +void OptionRow::LoadNormal( OptionRowHandler *pHand, bool bFirstItemGoesDown ) { - m_RowDef = def; + m_RowDef = pHand->m_Def; m_RowType = OptionRow::RowType_Normal; m_pHand = pHand; m_bFirstItemGoesDown = bFirstItemGoesDown; diff --git a/stepmania/src/OptionRow.h b/stepmania/src/OptionRow.h index 2c814fb884..661f2101d9 100644 --- a/stepmania/src/OptionRow.h +++ b/stepmania/src/OptionRow.h @@ -134,7 +134,7 @@ public: ~OptionRow(); void Clear(); - void LoadNormal( const OptionRowDefinition &def, OptionRowHandler *pHand, bool bFirstItemGoesDown ); + void LoadNormal( OptionRowHandler *pHand, bool bFirstItemGoesDown ); void LoadExit(); void SetOptionIcon( PlayerNumber pn, const CString &sText, GameCommand &gc ); diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 3e2d220ad4..a2089ff9cd 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -214,12 +214,9 @@ void ScreenOptions::InitMenu( const vector &vHands ) row.SetDrawOrder( 1 ); m_framePage.AddChild( &row ); - OptionRowHandler* hand = vHands[r]; - const OptionRowDefinition &def = vHands[r]->m_Def; - bool bFirstRowGoesDown = m_OptionsNavigation==NAV_TOGGLE_THREE_KEY; - row.LoadNormal( def, hand, bFirstRowGoesDown ); + row.LoadNormal( vHands[r], bFirstRowGoesDown ); row.InitText(); }