From dae80d0805eb5de24b6ac098355f497aea079271 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 22 Sep 2005 01:27:00 +0000 Subject: [PATCH] add GenericTweenOn() --- stepmania/src/ScreenWithMenuElements.cpp | 5 ++++- stepmania/src/ScreenWithMenuElements.h | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp index 643b0b2e55..64710448a8 100644 --- a/stepmania/src/ScreenWithMenuElements.cpp +++ b/stepmania/src/ScreenWithMenuElements.cpp @@ -140,7 +140,10 @@ void ScreenWithMenuElements::BeginScreen() m_Out.Reset(); m_Cancel.Reset(); - TweenOnScreen(); + if( GenericTweenOn() ) + this->PlayCommand( "On" ); + else + TweenOnScreen(); // deprecated m_In.StartTransitioning( SM_DoneFadingIn ); Screen::BeginScreen(); diff --git a/stepmania/src/ScreenWithMenuElements.h b/stepmania/src/ScreenWithMenuElements.h index ffeff8413d..3206789d8e 100644 --- a/stepmania/src/ScreenWithMenuElements.h +++ b/stepmania/src/ScreenWithMenuElements.h @@ -41,6 +41,11 @@ protected: virtual void StartPlayingMusic(); virtual void LoadHelpText(); + /* If true, BeginScreen() will run OnCommand on the whole screen, and + * TweenOnScreen will not be called. (Eventually, all screens should + * use this, and this will be removed.) */ + virtual bool GenericTweenOn() const { return false; } + AutoActor m_sprUnderlay; AutoActor m_autoHeader; Sprite m_sprStyleIcon;