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

LoadOptionIcon -> SetOptionIcon

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-15 05:43:10 +00:00
parent 5c441a5fdf
commit d9068e601d
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+2 -4
View File
@@ -279,9 +279,7 @@ void OptionRow::AfterImportOptions()
// init row icons // init row icons
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
{ SetOptionIcon( p, "" );
LoadOptionIcon( p, "" );
}
// If the items will go off the edge of the screen, then re-init with the "long row" style. // If the items will go off the edge of the screen, then re-init with the "long row" style.
{ {
@@ -645,7 +643,7 @@ void OptionRow::UpdateEnabledDisabled()
} }
} }
void OptionRow::LoadOptionIcon( PlayerNumber pn, const CString &sText ) void OptionRow::SetOptionIcon( PlayerNumber pn, const CString &sText )
{ {
m_OptionIcons[pn].Set( pn, sText, false ); m_OptionIcons[pn].Set( pn, sText, false );
} }
stepmania/src/OptionRow.h
+1 -1
View File
@@ -92,7 +92,7 @@ public:
void LoadMetrics( const CString &sType ); void LoadMetrics( const CString &sType );
void LoadNormal( const OptionRowDefinition &def, OptionRowHandler *pHand, bool bFirstItemGoesDown ); void LoadNormal( const OptionRowDefinition &def, OptionRowHandler *pHand, bool bFirstItemGoesDown );
void LoadExit(); void LoadExit();
void LoadOptionIcon( PlayerNumber pn, const CString &sText ); void SetOptionIcon( PlayerNumber pn, const CString &sText );
CString GetRowTitle() const; CString GetRowTitle() const;
stepmania/src/ScreenOptions.cpp
+2 -2
View File
@@ -195,9 +195,9 @@ void ScreenOptions::Init()
} }
} }
void ScreenOptions::LoadOptionIcon( PlayerNumber pn, int iRow, CString sText ) void ScreenOptions::SetOptionIcon( PlayerNumber pn, int iRow, CString sText )
{ {
m_pRows[iRow]->LoadOptionIcon( pn, sText ); m_pRows[iRow]->SetOptionIcon( pn, sText );
} }
void ScreenOptions::InitMenu( const vector<OptionRowDefinition> &vDefs, const vector<OptionRowHandler*> &vHands ) void ScreenOptions::InitMenu( const vector<OptionRowDefinition> &vDefs, const vector<OptionRowHandler*> &vHands )
stepmania/src/ScreenOptions.h
+1 -1
View File
@@ -81,7 +81,7 @@ protected:
bool AllAreOnLastRow() const; bool AllAreOnLastRow() const;
protected: // derived classes need access to these protected: // derived classes need access to these
void LoadOptionIcon( PlayerNumber pn, int iRow, CString sText ); void SetOptionIcon( PlayerNumber pn, int iRow, CString sText );
enum Navigation { NAV_THREE_KEY, NAV_THREE_KEY_MENU, NAV_FIVE_KEY, NAV_TOGGLE_THREE_KEY, NAV_TOGGLE_FIVE_KEY }; enum Navigation { NAV_THREE_KEY, NAV_THREE_KEY_MENU, NAV_FIVE_KEY, NAV_TOGGLE_THREE_KEY, NAV_TOGGLE_FIVE_KEY };
void SetNavigation( Navigation nav ) { m_OptionsNavigation = nav; } void SetNavigation( Navigation nav ) { m_OptionsNavigation = nav; }
void SetInputMode( InputMode im ) { m_InputMode = im; } void SetInputMode( InputMode im ) { m_InputMode = im; }
stepmania/src/ScreenOptionsMaster.cpp
+1 -1
View File
@@ -186,7 +186,7 @@ void ScreenOptionsMaster::RefreshIcons( int r, PlayerNumber pn )
if( def.m_bOneChoiceForAllPlayers ) if( def.m_bOneChoiceForAllPlayers )
sIcon = ""; sIcon = "";
LoadOptionIcon( pn, r, sIcon ); SetOptionIcon( pn, r, sIcon );
} }
void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM ) void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM )