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

Stage -> StageDisplay (longer name to fix lookup conflict with 'StageFrame')

Browse Source
This commit is contained in:
Chris Danford
2008-03-29 11:27:34 +00:00
parent 7e214aabf1
commit 865894c96f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenWithMenuElements.cpp
+9 -9
View File
@@ -11,7 +11,7 @@
#include "InputEventPlus.h" #include "InputEventPlus.h"
#define TIMER_STEALTH THEME->GetMetricB(m_sName,"TimerStealth") #define TIMER_STEALTH THEME->GetMetricB(m_sName,"TimerStealth")
#define SHOW_STAGE THEME->GetMetricB(m_sName,"ShowStage") #define SHOW_STAGE_DISPLAY THEME->GetMetricB(m_sName,"ShowStageDisplay")
#define MEMORY_CARD_ICONS THEME->GetMetricB(m_sName,"MemoryCardIcons") #define MEMORY_CARD_ICONS THEME->GetMetricB(m_sName,"MemoryCardIcons")
#define FORCE_TIMER THEME->GetMetricB(m_sName,"ForceTimer") #define FORCE_TIMER THEME->GetMetricB(m_sName,"ForceTimer")
#define STOP_MUSIC_ON_BACK THEME->GetMetricB(m_sName,"StopMusicOnBack") #define STOP_MUSIC_ON_BACK THEME->GetMetricB(m_sName,"StopMusicOnBack")
@@ -42,12 +42,12 @@ void ScreenWithMenuElements::Init()
LOAD_ALL_COMMANDS_AND_SET_XY( m_autoHeader ); LOAD_ALL_COMMANDS_AND_SET_XY( m_autoHeader );
this->AddChild( m_autoHeader ); this->AddChild( m_autoHeader );
if( SHOW_STAGE ) if( SHOW_STAGE_DISPLAY )
{ {
m_sprStage.Load( THEME->GetPathG(m_sName,"stage") ); m_sprStageDisplay.Load( THEME->GetPathG(m_sName,"StageDisplay") );
m_sprStage->SetName( "Stage" ); m_sprStageDisplay->SetName( "StageDisplay" );
LOAD_ALL_COMMANDS_AND_SET_XY( m_sprStage ); LOAD_ALL_COMMANDS_AND_SET_XY( m_sprStageDisplay );
this->AddChild( m_sprStage ); this->AddChild( m_sprStageDisplay );
} }
if( MEMORY_CARD_ICONS ) if( MEMORY_CARD_ICONS )
@@ -166,8 +166,8 @@ void ScreenWithMenuElements::TweenOnScreen()
{ {
ON_COMMAND( m_autoHeader ); ON_COMMAND( m_autoHeader );
if( SHOW_STAGE && !m_sprStage->GetName().empty() ) if( SHOW_STAGE_DISPLAY && !m_sprStageDisplay->GetName().empty() )
ON_COMMAND( m_sprStage ); ON_COMMAND( m_sprStageDisplay );
if( MEMORY_CARD_ICONS ) if( MEMORY_CARD_ICONS )
{ {
@@ -269,7 +269,7 @@ void ScreenWithMenuElements::TweenOffScreen()
} }
OFF_COMMAND( m_autoHeader ); OFF_COMMAND( m_autoHeader );
OFF_COMMAND( m_sprStage ); OFF_COMMAND( m_sprStageDisplay );
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
if( m_MemoryCardDisplay[p] ) if( m_MemoryCardDisplay[p] )
OFF_COMMAND( m_MemoryCardDisplay[p] ); OFF_COMMAND( m_MemoryCardDisplay[p] );