From dc7fcbc7765d37838e5d24b336e31ad74996e549 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 15 Jan 2005 18:54:04 +0000 Subject: [PATCH] remove m_Overlay (duplicates ScreenWithMenuElements::m_sprOverlay) --- stepmania/src/ScreenSelectMusic.cpp | 8 ++------ stepmania/src/ScreenSelectMusic.h | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 1ba78d668e..f8a1c67437 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -306,10 +306,6 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme this->AddChild( &m_sprNonPresence[p] ); } - m_Overlay.SetName( "Overlay"); - m_Overlay.LoadFromAniDir( THEME->GetPathB(m_sName, "overlay")); - this->AddChild( &m_Overlay ); - m_bgOptionsOut.Load( THEME->GetPathToB(m_sName+" options out") ); // this->AddChild( &m_bgOptionsOut ); // drawn on top m_bgNoOptionsOut.Load( THEME->GetPathToB(m_sName+" no options out") ); @@ -514,7 +510,7 @@ void ScreenSelectMusic::TweenOnScreen() ON_COMMAND( m_MusicWheel ); ON_COMMAND( m_Artist ); ON_COMMAND( m_MachineRank ); - ON_COMMAND( m_Overlay ); + ON_COMMAND( m_sprOverlay ); FOREACH_HumanPlayer( p ) { @@ -568,7 +564,7 @@ void ScreenSelectMusic::TweenOffScreen() OFF_COMMAND( m_sprCourseHasMods ); OFF_COMMAND( m_Artist ); OFF_COMMAND( m_MachineRank ); - OFF_COMMAND( m_Overlay ); + OFF_COMMAND( m_sprOverlay ); FOREACH_HumanPlayer( p ) { diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index c3e02fa541..eb35969f01 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -22,7 +22,6 @@ #include "HelpDisplay.h" #include "PaneDisplay.h" #include "Character.h" -#include "BGAnimation.h" #include "RageUtil_BackgroundLoader.h" class ScreenSelectMusic : public ScreenWithMenuElements @@ -110,7 +109,6 @@ protected: float m_fSampleStartSeconds, m_fSampleLengthSeconds; bool m_bAllowOptionsMenu, m_bAllowOptionsMenuRepeat; - BGAnimation m_Overlay; Transition m_bgOptionsOut; Transition m_bgNoOptionsOut;