From 10ad53d84521a8b462e1ed49ec424303ceabf714 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 26 Feb 2005 10:23:05 +0000 Subject: [PATCH] use the same overlay for gameplay and demonstration --- stepmania/src/ScreenDemonstration.cpp | 4 ---- stepmania/src/ScreenDemonstration.h | 3 --- stepmania/src/ScreenGameplay.cpp | 8 ++++---- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp index 8e276476a8..b113692cd1 100644 --- a/stepmania/src/ScreenDemonstration.cpp +++ b/stepmania/src/ScreenDemonstration.cpp @@ -43,10 +43,6 @@ void ScreenDemonstration::Init() } - m_Overlay.LoadFromAniDir( THEME->GetPathB("ScreenDemonstration","overlay") ); - m_Overlay.PlayCommand( "On" ); - this->AddChild( &m_Overlay ); - this->MoveToTail( &m_In ); this->MoveToTail( &m_Out ); diff --git a/stepmania/src/ScreenDemonstration.h b/stepmania/src/ScreenDemonstration.h index 255a396d74..565335668a 100644 --- a/stepmania/src/ScreenDemonstration.h +++ b/stepmania/src/ScreenDemonstration.h @@ -13,9 +13,6 @@ public: virtual void Init(); virtual void HandleScreenMessage( const ScreenMessage SM ); - -protected: - BGAnimation m_Overlay; }; #endif diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index a9f2429c92..6786297cfb 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -604,6 +604,10 @@ void ScreenGameplay::Init() // } } + m_Overlay.Load( THEME->GetPathB(m_sName,"overlay") ); + m_Overlay->SetDrawOrder( DRAW_ORDER_OVERLAY ); + this->AddChild( m_Overlay ); + if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it { @@ -647,10 +651,6 @@ void ScreenGameplay::Init() SET_XY( m_textDebug ); this->AddChild( &m_textDebug ); - m_Overlay.Load( THEME->GetPathB(m_sName,"overlay") ); - m_Overlay->SetDrawOrder( DRAW_ORDER_OVERLAY ); - this->AddChild( m_Overlay ); - m_In.Load( THEME->GetPathB(m_sName,"in") ); m_In.SetDrawOrder( DRAW_ORDER_TRANSITIONS ); this->AddChild( &m_In );