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

Cleanup. Allow disabling the timer completely.

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-26 23:27:22 +00:00
parent e97b5fe587
commit c3df5b5984
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MenuElements.cpp
+16 -2
View File
@@ -32,6 +32,7 @@
#define TIMER_OFF_COMMAND THEME->GetMetric("MenuElements","TimerOffCommand") #define TIMER_OFF_COMMAND THEME->GetMetric("MenuElements","TimerOffCommand")
#define HELP_ON_COMMAND THEME->GetMetric("MenuElements","HelpOnCommand") #define HELP_ON_COMMAND THEME->GetMetric("MenuElements","HelpOnCommand")
#define HELP_OFF_COMMAND THEME->GetMetric("MenuElements","HelpOffCommand") #define HELP_OFF_COMMAND THEME->GetMetric("MenuElements","HelpOffCommand")
#define TIMER_SECONDS THEME->GetMetricI(m_sName,"TimerSeconds")
MenuElements::MenuElements() MenuElements::MenuElements()
@@ -62,12 +63,21 @@ void MenuElements::Load( CString sClassName, bool bEnableTimer, bool bLoadStyleI
this->AddChild( &m_sprStyleIcon ); 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 = (TIMER_SECONDS != -1);
if( m_bTimerEnabled )
{
m_MenuTimer.Command( TIMER_ON_COMMAND ); m_MenuTimer.Command( TIMER_ON_COMMAND );
if( bEnableTimer && PREFSMAN->m_bMenuTimer && !GAMESTATE->m_bEditing ) if( bEnableTimer && PREFSMAN->m_bMenuTimer && !GAMESTATE->m_bEditing )
m_MenuTimer.SetSeconds( THEME->GetMetricI(m_sName,"TimerSeconds") ); m_MenuTimer.SetSeconds( TIMER_SECONDS );
else else
m_MenuTimer.Disable(); m_MenuTimer.Disable();
this->AddChild( &m_MenuTimer ); this->AddChild( &m_MenuTimer );
}
m_sprFooter.Load( THEME->GetPathToG(m_sName+" footer") ); m_sprFooter.Load( THEME->GetPathToG(m_sName+" footer") );
m_sprFooter.Command( FOOTER_ON_COMMAND ); m_sprFooter.Command( FOOTER_ON_COMMAND );
@@ -101,13 +111,16 @@ void MenuElements::Update( float fDeltaTime )
} }
void MenuElements::StartTransitioning( ScreenMessage smSendWhenDone ) void MenuElements::StartTransitioning( ScreenMessage smSendWhenDone )
{
if( m_bTimerEnabled )
{ {
m_MenuTimer.SetSeconds( 0 ); m_MenuTimer.SetSeconds( 0 );
m_MenuTimer.Stop(); m_MenuTimer.Stop();
m_MenuTimer.Command( TIMER_OFF_COMMAND );
}
m_sprHeader.Command( HEADER_OFF_COMMAND ); m_sprHeader.Command( HEADER_OFF_COMMAND );
m_sprStyleIcon.Command( STYLE_ICON_OFF_COMMAND ); m_sprStyleIcon.Command( STYLE_ICON_OFF_COMMAND );
m_MenuTimer.Command( TIMER_OFF_COMMAND );
m_sprFooter.Command( FOOTER_OFF_COMMAND ); m_sprFooter.Command( FOOTER_OFF_COMMAND );
m_textHelp.Command( HELP_OFF_COMMAND ); m_textHelp.Command( HELP_OFF_COMMAND );
@@ -149,6 +162,7 @@ void MenuElements::DrawTopLayer()
m_sprHeader.Draw(); m_sprHeader.Draw();
m_sprStyleIcon.Draw(); m_sprStyleIcon.Draw();
if( m_bTimerEnabled )
m_MenuTimer.Draw(); m_MenuTimer.Draw();
m_sprFooter.Draw(); m_sprFooter.Draw();
m_textHelp.Draw(); m_textHelp.Draw();
stepmania/src/MenuElements.h
+1
View File
@@ -36,6 +36,7 @@ public:
void Back( ScreenMessage smSendWhenDone ); void Back( ScreenMessage smSendWhenDone );
void Update( float fDeltaTime ); void Update( float fDeltaTime );
bool IsTransitioning(); bool IsTransitioning();
bool m_bTimerEnabled;
public: // let owner tinker with these objects public: // let owner tinker with these objects