diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index b6774ee606..d4c76794bb 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -206,11 +206,6 @@ void ScreenOptions::Init() m_OptionRowType.Load( m_sName ); } -void ScreenOptions::SetOptionIcon( PlayerNumber pn, int iRow, CString sText, GameCommand &gc ) -{ - m_pRows[iRow]->SetOptionIcon( pn, sText, gc ); -} - void ScreenOptions::InitMenu( const vector &vDefs, const vector &vHands ) { LOG->Trace( "ScreenOptions::InitMenu()" ); @@ -451,7 +446,7 @@ void ScreenOptions::RefreshIcons( int iRow, PlayerNumber pn ) if( def.m_bOneChoiceForAllPlayers ) sIcon = ""; - SetOptionIcon( pn, iRow, sIcon, gc ); + m_pRows[iRow]->SetOptionIcon( pn, sIcon, gc ); } void ScreenOptions::RefreshAllIcons() diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index 2ab6e5c186..85f0a8e816 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -98,8 +98,6 @@ public: friend class LunaScreenOptions; protected: // derived classes need access to these - void SetOptionIcon( PlayerNumber pn, int iRow, CString sText, GameCommand &gc ); - 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; }