diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 2c40e1142e..95b8b92a24 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -87,7 +87,7 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme void ScreenSelectMusic::Init() { - m_bSelectIsDown = false; // used by LoadHelpText which is called by ScreenWithMenuElements::Init() + m_bSelectIsDown = false; // used by UpdateSelectButton ScreenWithMenuElements::Init(); @@ -715,7 +715,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input ) if( m_bMadeChoice ) return; // ignore - LoadHelpText(); + UpdateSelectButton(); if( input.MenuI.button == MENU_BUTTON_SELECT ) { @@ -893,10 +893,8 @@ void ScreenSelectMusic::Input( const InputEventPlus &input ) } } -void ScreenSelectMusic::LoadHelpText() +void ScreenSelectMusic::UpdateSelectButton() { - ScreenWithMenuElements::LoadHelpText(); - bool bSelectIsDown = false; FOREACH_EnabledPlayer( p ) bSelectIsDown |= INPUTMAPPER->IsButtonDown( MenuInput(p, MENU_BUTTON_SELECT) ); @@ -1448,7 +1446,6 @@ void ScreenSelectMusic::AfterMusicChange() if( GAMESTATE->m_SortOrder != s_lastSortOrder ) { // Reload to let Lua metrics have a chance to change the help text. - LoadHelpText(); s_lastSortOrder = GAMESTATE->m_SortOrder; } diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index f812df2c52..f1cf1379a4 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -61,7 +61,7 @@ protected: void TweenCoursePartsOffScreen( bool Final ); void SkipSongPartTweens(); void SkipCoursePartTweens(); - virtual void LoadHelpText(); + void UpdateSelectButton(); void ChangeDifficulty( PlayerNumber pn, int dir );