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

Remove LoadHelpText overload. Call settips() yourself via message

Browse Source 
commands instead.
This commit is contained in:
Glenn Maynard
2006-01-14 02:35:08 +00:00
parent e05770c65b
commit f0dc808168
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+3 -6
View File
@@ -87,7 +87,7 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme
void ScreenSelectMusic::Init() void ScreenSelectMusic::Init()
{ {
m_bSelectIsDown = false; // used by LoadHelpText which is called by ScreenWithMenuElements::Init() m_bSelectIsDown = false; // used by UpdateSelectButton
ScreenWithMenuElements::Init(); ScreenWithMenuElements::Init();
@@ -715,7 +715,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
if( m_bMadeChoice ) if( m_bMadeChoice )
return; // ignore return; // ignore
LoadHelpText(); UpdateSelectButton();
if( input.MenuI.button == MENU_BUTTON_SELECT ) 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; bool bSelectIsDown = false;
FOREACH_EnabledPlayer( p ) FOREACH_EnabledPlayer( p )
bSelectIsDown |= INPUTMAPPER->IsButtonDown( MenuInput(p, MENU_BUTTON_SELECT) ); bSelectIsDown |= INPUTMAPPER->IsButtonDown( MenuInput(p, MENU_BUTTON_SELECT) );
@@ -1448,7 +1446,6 @@ void ScreenSelectMusic::AfterMusicChange()
if( GAMESTATE->m_SortOrder != s_lastSortOrder ) if( GAMESTATE->m_SortOrder != s_lastSortOrder )
{ {
// Reload to let Lua metrics have a chance to change the help text. // Reload to let Lua metrics have a chance to change the help text.
LoadHelpText();
s_lastSortOrder = GAMESTATE->m_SortOrder; s_lastSortOrder = GAMESTATE->m_SortOrder;
} }
stepmania/src/ScreenSelectMusic.h
+1 -1
View File
@@ -61,7 +61,7 @@ protected:
void TweenCoursePartsOffScreen( bool Final ); void TweenCoursePartsOffScreen( bool Final );
void SkipSongPartTweens(); void SkipSongPartTweens();
void SkipCoursePartTweens(); void SkipCoursePartTweens();
virtual void LoadHelpText(); void UpdateSelectButton();
void ChangeDifficulty( PlayerNumber pn, int dir ); void ChangeDifficulty( PlayerNumber pn, int dir );