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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-17 21:40:39 +00:00
parent ce43aab773
commit a42ba8e13f
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+2 -2
View File
@@ -153,9 +153,9 @@ void OptionRowType::Load( const CString &sType )
m_OptionIcon.Load( 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_RowType = OptionRow::RowType_Normal;
m_pHand = pHand; m_pHand = pHand;
m_bFirstItemGoesDown = bFirstItemGoesDown; m_bFirstItemGoesDown = bFirstItemGoesDown;
stepmania/src/OptionRow.h
+1 -1
View File
@@ -134,7 +134,7 @@ public:
~OptionRow(); ~OptionRow();
void Clear(); void Clear();
void LoadNormal( const OptionRowDefinition &def, OptionRowHandler *pHand, bool bFirstItemGoesDown ); void LoadNormal( OptionRowHandler *pHand, bool bFirstItemGoesDown );
void LoadExit(); void LoadExit();
void SetOptionIcon( PlayerNumber pn, const CString &sText, GameCommand &gc ); void SetOptionIcon( PlayerNumber pn, const CString &sText, GameCommand &gc );
stepmania/src/ScreenOptions.cpp
+1 -4
View File
@@ -214,12 +214,9 @@ void ScreenOptions::InitMenu( const vector<OptionRowHandler*> &vHands )
row.SetDrawOrder( 1 ); row.SetDrawOrder( 1 );
m_framePage.AddChild( &row ); m_framePage.AddChild( &row );
OptionRowHandler* hand = vHands[r];
const OptionRowDefinition &def = vHands[r]->m_Def;
bool bFirstRowGoesDown = m_OptionsNavigation==NAV_TOGGLE_THREE_KEY; bool bFirstRowGoesDown = m_OptionsNavigation==NAV_TOGGLE_THREE_KEY;
row.LoadNormal( def, hand, bFirstRowGoesDown ); row.LoadNormal( vHands[r], bFirstRowGoesDown );
row.InitText(); row.InitText();
} }