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

use GetNextScreen()

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-15 18:35:26 +00:00
parent 46485f885d
commit 4ed508978a
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSplash.cpp
+1 -2
View File
@@ -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
stepmania/src/ScreenSplash.h
-1
View File
@@ -18,7 +18,6 @@ public:
protected:
ThemeMetric<bool> ALLOW_START_TO_SKIP;
ThemeMetric<CString> NEXT_SCREEN;
ThemeMetric<float> MINIMUM_LOAD_DELAY_SECONDS;
ThemeMetric<bool> PREPARE_SCREEN;
};
stepmania/src/ScreenStage.cpp
+2 -3
View File
@@ -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() );