simplify
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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 );
|
||||
|
||||
@@ -214,12 +214,9 @@ void ScreenOptions::InitMenu( const vector<OptionRowHandler*> &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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user