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

reduce MenuTimer dependencies

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-07 20:10:38 +00:00
parent a5f53bcd44
commit 884488732d
11 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MenuElements.cpp
+21 -9
View File
@@ -16,10 +16,10 @@
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
#include "RageLog.h"
#include "RageLog.h"
#include "GameManager.h"
#include "GameState.h"
#include "ThemeManager.h"
#include "MenuTimer.h"
#define TIMER_SECONDS THEME->GetMetricI(m_sName,"TimerSeconds")
@@ -28,6 +28,12 @@
MenuElements::MenuElements()
{
m_MenuTimer = new MenuTimer;
}
MenuElements::~MenuElements()
{
delete m_MenuTimer;
}
void MenuElements::Load( CString sClassName )
@@ -59,13 +65,13 @@ void MenuElements::Load( CString sClassName )
m_bTimerEnabled = (TIMER_SECONDS != -1);
if( m_bTimerEnabled )
{
m_MenuTimer.SetName( "Timer" );
m_MenuTimer->SetName( "Timer" );
UtilOnCommand( m_MenuTimer, "MenuElements" );
if( TIMER_SECONDS > 0 && PREFSMAN->m_bMenuTimer && !GAMESTATE->m_bEditing )
m_MenuTimer.SetSeconds( TIMER_SECONDS );
m_MenuTimer->SetSeconds( TIMER_SECONDS );
else
m_MenuTimer.Disable();
this->AddChild( &m_MenuTimer );
m_MenuTimer->Disable();
this->AddChild( m_MenuTimer );
}
m_autoFooter.Load( THEME->GetPathToG(m_sName+" footer") );
@@ -105,8 +111,8 @@ void MenuElements::StartTransitioning( ScreenMessage smSendWhenDone )
{
if( m_bTimerEnabled )
{
m_MenuTimer.SetSeconds( 0 );
m_MenuTimer.Stop();
m_MenuTimer->SetSeconds( 0 );
m_MenuTimer->Stop();
UtilOffCommand( m_MenuTimer, "MenuElements" );
}
@@ -137,7 +143,7 @@ void MenuElements::Back( ScreenMessage smSendWhenDone )
if( m_Back.IsTransitioning() )
return; // ignore
m_MenuTimer.Stop();
m_MenuTimer->Stop();
m_Back.StartTransitioning( smSendWhenDone );
m_soundBack.Play();
}
@@ -154,7 +160,7 @@ void MenuElements::DrawTopLayer()
m_autoHeader->Draw();
m_sprStyleIcon.Draw();
if( m_bTimerEnabled )
m_MenuTimer.Draw();
m_MenuTimer->Draw();
m_autoFooter->Draw();
m_textHelp.Draw();
m_In.Draw();
@@ -177,3 +183,9 @@ bool MenuElements::IsTransitioning()
{
return m_In.IsTransitioning() || m_Out.IsTransitioning() || m_Back.IsTransitioning();
}
void MenuElements::StopTimer()
{
m_MenuTimer->Stop();
}