From 36beda7333101c16a620ac65645911a78fa348d7 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 25 Jan 2004 01:59:57 +0000 Subject: [PATCH] add overlay BGA to screen gameplay --- stepmania/src/ScreenGameplay.cpp | 6 ++++++ stepmania/src/ScreenGameplay.h | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 10bc043664..5fbff12e81 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -681,6 +681,10 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S m_Back.SetZ( -2 ); // on top of everything else this->AddChild( &m_Back ); + m_Overlay.LoadFromAniDir( THEME->GetPathToB("ScreenGameplay Overlay") ); + m_Overlay.SetZ( -4 ); // on top of everything else + this->AddChild( &m_Overlay ); + if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() ) // only load if we're going to use it { @@ -2276,6 +2280,7 @@ void ScreenGameplay::TweenOnScreen() ON_COMMAND( m_textPlayerOptions[p] ); ON_COMMAND( m_DifficultyIcon[p] ); } + m_Overlay.PlayCommand("On"); } void ScreenGameplay::TweenOffScreen() @@ -2306,6 +2311,7 @@ void ScreenGameplay::TweenOffScreen() OFF_COMMAND( m_textPlayerOptions[p] ); OFF_COMMAND( m_DifficultyIcon[p] ); } + m_Overlay.PlayCommand("Off"); m_textDebug.StopTweening(); m_textDebug.BeginTweening( 1/8.f ); diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index a888913359..228cbf1223 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -148,6 +148,7 @@ protected: Transition m_Draw; Transition m_In; Transition m_Back; + BGAnimation m_Overlay; BitmapText m_textSurviveTime; // used in extra stage BitmapText m_textSongTitle; @@ -160,8 +161,9 @@ protected: DifficultyIcon m_DifficultyIcon[NUM_PLAYERS]; - BGAnimation m_bgaBH; - Sprite m_sprBH; + // These aren't used. Are they left-overs from BeginnerHelper work? -Chris +// BGAnimation m_bgaBH; +// Sprite m_sprBH; Sprite m_sprOniGameOver[NUM_PLAYERS]; void ShowOniGameOver( PlayerNumber pn );