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

remove MenuElements::Load( bool bEnableTimer )

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-27 05:02:04 +00:00
parent 380b73b3c1
commit d145a90560
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MenuElements.cpp
+3 -8
View File
@@ -40,7 +40,7 @@ MenuElements::MenuElements()
{ {
} }
void MenuElements::Load( CString sClassName, bool bEnableTimer ) void MenuElements::Load( CString sClassName )
{ {
LOG->Trace( "MenuElements::MenuElements()" ); LOG->Trace( "MenuElements::MenuElements()" );
@@ -64,16 +64,11 @@ void MenuElements::Load( CString sClassName, bool bEnableTimer )
this->AddChild( &m_sprStyleIcon ); this->AddChild( &m_sprStyleIcon );
} }
/* XXX: If bEnableTimer is false, it means the timer is shown but disabled. m_bTimerEnabled = (TIMER_SECONDS != -1);
* If TIMER_SECONDS is -1, then the timer isn't shown at all. bTimerEnabled == 0
* is the same as !bTimerEnabled. Phase out bTimerEnabled and just set no timer
* in the theme. */
m_bTimerEnabled = !bEnableTimer || (TIMER_SECONDS != -1);
if( m_bTimerEnabled ) if( m_bTimerEnabled )
{ {
m_MenuTimer.Command( TIMER_ON_COMMAND ); m_MenuTimer.Command( TIMER_ON_COMMAND );
if( bEnableTimer && PREFSMAN->m_bMenuTimer && !GAMESTATE->m_bEditing ) if( TIMER_SECONDS > 0 && PREFSMAN->m_bMenuTimer && !GAMESTATE->m_bEditing )
m_MenuTimer.SetSeconds( TIMER_SECONDS ); m_MenuTimer.SetSeconds( TIMER_SECONDS );
else else
m_MenuTimer.Disable(); m_MenuTimer.Disable();
stepmania/src/MenuElements.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
virtual void DrawPrimitives(); virtual void DrawPrimitives();
void Load( CString sClassName, bool bEnableTimer = true ); void Load( CString sClassName );
void DrawTopLayer(); void DrawTopLayer();
void DrawBottomLayer(); void DrawBottomLayer();