From de339d9b00280bf7ab4bfcbeff93425b294926c5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 26 Feb 2005 09:16:34 +0000 Subject: [PATCH] AutoActor overlay --- stepmania/src/ScreenGameplay.cpp | 10 +++++----- stepmania/src/ScreenGameplay.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index ba1a86bfb6..a70d85fdb6 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -653,9 +653,9 @@ void ScreenGameplay::Init() SET_XY( m_textDebug ); this->AddChild( &m_textDebug ); - m_Overlay.LoadFromAniDir( THEME->GetPathB(m_sName,"Overlay") ); - m_Overlay.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 ); - this->AddChild( &m_Overlay ); + m_Overlay.Load( THEME->GetPathB(m_sName,"overlay") ); + m_Overlay->SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 ); + this->AddChild( m_Overlay ); m_In.Load( THEME->GetPathB(m_sName,"in") ); m_In.SetDrawOrder( DRAW_ORDER_TRANSITIONS ); @@ -2420,7 +2420,7 @@ void ScreenGameplay::TweenOnScreen() FOREACH_NSScoreBoardColumn( sc ) ON_COMMAND( m_Scoreboard[sc] ); - m_Overlay.PlayCommand("On"); + m_Overlay->PlayCommand("On"); } void ScreenGameplay::TweenOffScreen() @@ -2455,7 +2455,7 @@ void ScreenGameplay::TweenOffScreen() OFF_COMMAND( m_DifficultyIcon[p] ); OFF_COMMAND( m_DifficultyMeter[p] ); } - m_Overlay.PlayCommand("Off"); + m_Overlay->PlayCommand("Off"); if (m_ShowScoreboard) FOREACH_NSScoreBoardColumn( sc ) diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 7965cdd69d..6eca8e1caa 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -130,7 +130,7 @@ protected: Transition m_Draw; Transition m_In; Transition m_Back; - BGAnimation m_Overlay; + AutoActor m_Overlay; BitmapText m_textSurviveTime; // used in extra stage BitmapText m_textSongTitle;