From 71a23141da0656395d13063f6543762b1c7ad316 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 26 Jan 2003 00:52:39 +0000 Subject: [PATCH] go back to using FocusingSprites --- stepmania/src/ScreenGameplay.cpp | 14 ++++++-------- stepmania/src/ScreenGameplay.h | 5 +++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 045092befa..d2ac0d5164 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1162,17 +1162,15 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) case SM_User+1: break; case SM_User+2: - m_sprReady.BeginTweening(0.25f); - m_sprReady.SetTweenDiffuse( RageColor(1,1,1,1) ); + m_sprReady.StartFocusing(); m_announcerReady.PlayRandom(); break; case SM_User+3: break; case SM_User+4: + m_sprReady.StartBlurring(); break; case SM_User+5: - m_sprReady.SetDiffuse( RageColor(1,1,1,0) ); - m_announcerHereWeGo.PlayRandom(); m_Background.FadeIn(); GAMESTATE->m_bPastHereWeGo = true; break; @@ -1187,17 +1185,17 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) case SM_StartHereWeGo: /* We have 2.5 seconds until the notes start. */ - - m_sprHereWeGo.SetDiffuse( RageColor(1,1,1,1) ); - + m_sprHereWeGo.StartFocusing(); m_announcerHereWeGo.PlayRandom(); + /* This gives the HWG about a second of screen time. */ this->SendScreenMessage( SM_StopHereWeGo, 1.5f ); break; case SM_StopHereWeGo: /* We have one second until the notes start. */ - m_sprHereWeGo.SetTweenDiffuse( RageColor(1,1,1,0) ); + m_sprHereWeGo.StartBlurring(); + m_DancingState = STATE_DANCING; // STATE CHANGE! Now the user is allowed to press Back break; diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 80f0145bbf..f9f4ea06a5 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -28,6 +28,7 @@ #include "ScoreDisplay.h" #include "DifficultyIcon.h" #include "BPMDisplay.h" +#include "FocusingSprite.h" // messages sent by Combo const ScreenMessage SM_BeginToasty = ScreenMessage(SM_User+104); @@ -111,8 +112,8 @@ protected: TransitionFadeWipe m_Fade; TransitionStarWipe m_StarWipe; - Sprite m_sprReady; - Sprite m_sprHereWeGo; + FocusingSprite m_sprReady; + FocusingSprite m_sprHereWeGo; MotionBlurSprite m_sprCleared; MotionBlurSprite m_sprFailed; MotionBlurSprite m_sprTryExtraStage;