[Stepmania-cvs] stepmania/src ScreenSelectMusic.cpp,1.352,1.353 ScreenSelectMusic.h,1.68,1.69

[Glenn M. <gma...@us...>]

Update of /cvsroot/stepmania/stepmania/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20061

Modified Files:
	ScreenSelectMusic.cpp ScreenSelectMusic.h 
Log Message:
remove m_Overlay (duplicates ScreenWithMenuElements::m_sprOverlay)

Index: ScreenSelectMusic.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenSelectMusic.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -p -r1.68 -r1.69
--- ScreenSelectMusic.h	8 Sep 2004 02:53:54 -0000	1.68
+++ ScreenSelectMusic.h	15 Jan 2005 18:54:04 -0000	1.69
@@ -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;
 

Index: ScreenSelectMusic.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenSelectMusic.cpp,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -d -p -r1.352 -r1.353
--- ScreenSelectMusic.cpp	20 Dec 2004 06:25:58 -0000	1.352
+++ ScreenSelectMusic.cpp	15 Jan 2005 18:54:04 -0000	1.353
@@ -306,10 +306,6 @@ ScreenSelectMusic::ScreenSelectMusic( CS
 		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 )
 	{