From 4ed508978ad7c577c648ec4245be4d50b5335408 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 15 Jan 2006 18:35:26 +0000 Subject: [PATCH] use GetNextScreen() --- stepmania/src/ScreenSplash.cpp | 3 +-- stepmania/src/ScreenSplash.h | 1 - stepmania/src/ScreenStage.cpp | 5 ++--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenSplash.cpp b/stepmania/src/ScreenSplash.cpp index 972279c4fe..da87be80f8 100644 --- a/stepmania/src/ScreenSplash.cpp +++ b/stepmania/src/ScreenSplash.cpp @@ -10,7 +10,6 @@ AutoScreenMessage( SM_PrepScreen ) REGISTER_SCREEN_CLASS( ScreenSplash ); ScreenSplash::ScreenSplash( CString sClassName ) : ScreenWithMenuElements( sClassName ), ALLOW_START_TO_SKIP (m_sName,"AllowStartToSkip"), - NEXT_SCREEN (m_sName,"NextScreen"), MINIMUM_LOAD_DELAY_SECONDS (m_sName,"MinimumLoadDelaySeconds"), PREPARE_SCREEN (m_sName,"PrepareScreen") { @@ -30,7 +29,7 @@ void ScreenSplash::HandleScreenMessage( const ScreenMessage SM ) { RageTimer length; if( PREPARE_SCREEN ) - SCREENMAN->PrepareScreen( NEXT_SCREEN ); + SCREENMAN->PrepareScreen( GetNextScreen() ); float fScreenLoadSeconds = length.GetDeltaTime(); /* The screen load took fScreenLoadSeconds. Move on to the next screen after diff --git a/stepmania/src/ScreenSplash.h b/stepmania/src/ScreenSplash.h index 244d4d0a59..7ee9c6e9ed 100644 --- a/stepmania/src/ScreenSplash.h +++ b/stepmania/src/ScreenSplash.h @@ -18,7 +18,6 @@ public: protected: ThemeMetric ALLOW_START_TO_SKIP; - ThemeMetric NEXT_SCREEN; ThemeMetric MINIMUM_LOAD_DELAY_SECONDS; ThemeMetric PREPARE_SCREEN; }; diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp index 207660f46a..e6d93e9665 100644 --- a/stepmania/src/ScreenStage.cpp +++ b/stepmania/src/ScreenStage.cpp @@ -10,7 +10,6 @@ #include "ThemeManager.h" #include "LightsManager.h" -#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen") #define MINIMUM_DELAY THEME->GetMetricF(m_sName,"MinimumDelay") AutoScreenMessage( SM_PrepScreen ) @@ -59,7 +58,7 @@ void ScreenStage::HandleScreenMessage( const ScreenMessage SM ) if( SM == SM_PrepScreen ) { RageTimer length; - SCREENMAN->PrepareScreen( NEXT_SCREEN ); + SCREENMAN->PrepareScreen( GetNextScreen() ); float fScreenLoadSeconds = length.GetDeltaTime(); /* The screen load took fScreenLoadSeconds. Move on to the next screen after @@ -87,7 +86,7 @@ void ScreenStage::Update( float fDeltaTime ) { if( this->IsFirstUpdate() ) { - if( SCREENMAN->ConcurrentlyPrepareScreen(NEXT_SCREEN, SM_BeginFadingOut) ) + if( SCREENMAN->ConcurrentlyPrepareScreen(GetNextScreen(), SM_BeginFadingOut) ) { /* Continue when both the screen finishes loading and the tween finishes. */ this->PostScreenMessage( SM_BeginFadingOut, m_sprOverlay->GetTweenTimeLeft() );