actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove m_Overlay (duplicates ScreenWithMenuElements::m_sprOverlay)

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-15 18:54:04 +00:00
parent 314e801115
commit dc7fcbc776
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+2 -6
View File
@@ -306,10 +306,6 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme
this->AddChild( &m_sprNonPresence[p] ); 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") ); m_bgOptionsOut.Load( THEME->GetPathToB(m_sName+" options out") );
// this->AddChild( &m_bgOptionsOut ); // drawn on top // this->AddChild( &m_bgOptionsOut ); // drawn on top
m_bgNoOptionsOut.Load( THEME->GetPathToB(m_sName+" no options out") ); m_bgNoOptionsOut.Load( THEME->GetPathToB(m_sName+" no options out") );
@@ -514,7 +510,7 @@ void ScreenSelectMusic::TweenOnScreen()
ON_COMMAND( m_MusicWheel ); ON_COMMAND( m_MusicWheel );
ON_COMMAND( m_Artist ); ON_COMMAND( m_Artist );
ON_COMMAND( m_MachineRank ); ON_COMMAND( m_MachineRank );
ON_COMMAND( m_Overlay ); ON_COMMAND( m_sprOverlay );
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
{ {
@@ -568,7 +564,7 @@ void ScreenSelectMusic::TweenOffScreen()
OFF_COMMAND( m_sprCourseHasMods ); OFF_COMMAND( m_sprCourseHasMods );
OFF_COMMAND( m_Artist ); OFF_COMMAND( m_Artist );
OFF_COMMAND( m_MachineRank ); OFF_COMMAND( m_MachineRank );
OFF_COMMAND( m_Overlay ); OFF_COMMAND( m_sprOverlay );
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
{ {
stepmania/src/ScreenSelectMusic.h
-2
View File
@@ -22,7 +22,6 @@
#include "HelpDisplay.h" #include "HelpDisplay.h"
#include "PaneDisplay.h" #include "PaneDisplay.h"
#include "Character.h" #include "Character.h"
#include "BGAnimation.h"
#include "RageUtil_BackgroundLoader.h" #include "RageUtil_BackgroundLoader.h"
class ScreenSelectMusic : public ScreenWithMenuElements class ScreenSelectMusic : public ScreenWithMenuElements
@@ -110,7 +109,6 @@ protected:
float m_fSampleStartSeconds, m_fSampleLengthSeconds; float m_fSampleStartSeconds, m_fSampleLengthSeconds;
bool m_bAllowOptionsMenu, m_bAllowOptionsMenuRepeat; bool m_bAllowOptionsMenu, m_bAllowOptionsMenuRepeat;
BGAnimation m_Overlay;
Transition m_bgOptionsOut; Transition m_bgOptionsOut;
Transition m_bgNoOptionsOut; Transition m_bgNoOptionsOut;