From d145a90560589123474ffe79e269d9708fa0c9d5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 27 Sep 2003 05:02:04 +0000 Subject: [PATCH] remove MenuElements::Load( bool bEnableTimer ) --- stepmania/src/MenuElements.cpp | 11 +++-------- stepmania/src/MenuElements.h | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/stepmania/src/MenuElements.cpp b/stepmania/src/MenuElements.cpp index ccbb778d0e..351175eab2 100644 --- a/stepmania/src/MenuElements.cpp +++ b/stepmania/src/MenuElements.cpp @@ -40,7 +40,7 @@ MenuElements::MenuElements() { } -void MenuElements::Load( CString sClassName, bool bEnableTimer ) +void MenuElements::Load( CString sClassName ) { LOG->Trace( "MenuElements::MenuElements()" ); @@ -64,16 +64,11 @@ void MenuElements::Load( CString sClassName, bool bEnableTimer ) this->AddChild( &m_sprStyleIcon ); } - /* XXX: If bEnableTimer is false, it means the timer is shown but disabled. - * 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); - + m_bTimerEnabled = (TIMER_SECONDS != -1); if( m_bTimerEnabled ) { 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 ); else m_MenuTimer.Disable(); diff --git a/stepmania/src/MenuElements.h b/stepmania/src/MenuElements.h index 0ef86c7646..b56dcb0420 100644 --- a/stepmania/src/MenuElements.h +++ b/stepmania/src/MenuElements.h @@ -27,7 +27,7 @@ public: virtual void DrawPrimitives(); - void Load( CString sClassName, bool bEnableTimer = true ); + void Load( CString sClassName ); void DrawTopLayer(); void DrawBottomLayer();