From d9068e601df76141562bbeccdfac97bf4bebe087 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 15 Jul 2005 05:43:10 +0000 Subject: [PATCH] LoadOptionIcon -> SetOptionIcon --- stepmania/src/OptionRow.cpp | 6 ++---- stepmania/src/OptionRow.h | 2 +- stepmania/src/ScreenOptions.cpp | 4 ++-- stepmania/src/ScreenOptions.h | 2 +- stepmania/src/ScreenOptionsMaster.cpp | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp index 6458d0ba83..84d20fc353 100644 --- a/stepmania/src/OptionRow.cpp +++ b/stepmania/src/OptionRow.cpp @@ -279,9 +279,7 @@ void OptionRow::AfterImportOptions() // init row icons FOREACH_HumanPlayer( p ) - { - LoadOptionIcon( p, "" ); - } + SetOptionIcon( p, "" ); // 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 ); } diff --git a/stepmania/src/OptionRow.h b/stepmania/src/OptionRow.h index e246d59fc6..5b8cf2721d 100644 --- a/stepmania/src/OptionRow.h +++ b/stepmania/src/OptionRow.h @@ -92,7 +92,7 @@ public: void LoadMetrics( const CString &sType ); void LoadNormal( const OptionRowDefinition &def, OptionRowHandler *pHand, bool bFirstItemGoesDown ); void LoadExit(); - void LoadOptionIcon( PlayerNumber pn, const CString &sText ); + void SetOptionIcon( PlayerNumber pn, const CString &sText ); CString GetRowTitle() const; diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 565d0976c0..81ab3e77aa 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -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 &vDefs, const vector &vHands ) diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index 131251cf94..d90d29720c 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -81,7 +81,7 @@ protected: bool AllAreOnLastRow() const; 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 }; void SetNavigation( Navigation nav ) { m_OptionsNavigation = nav; } void SetInputMode( InputMode im ) { m_InputMode = im; } diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 9f3ffed908..e19e0259be 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -186,7 +186,7 @@ void ScreenOptionsMaster::RefreshIcons( int r, PlayerNumber pn ) if( def.m_bOneChoiceForAllPlayers ) sIcon = ""; - LoadOptionIcon( pn, r, sIcon ); + SetOptionIcon( pn, r, sIcon ); } void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM )