From 8a5bf17203e69ffab164cc3cd52356cddaba7e66 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 29 Jan 2005 23:45:27 +0000 Subject: [PATCH] remove some hardcoded screen names --- stepmania/Themes/default/metrics.ini | 7 +++++++ stepmania/src/ScreenEditCoursesMenu.cpp | 3 ++- stepmania/src/ScreenEditMenu.cpp | 3 ++- stepmania/src/ScreenEz2SelectMusic.cpp | 5 +++-- stepmania/src/ScreenEz2SelectPlayer.cpp | 3 ++- stepmania/src/ScreenReloadSongs.cpp | 4 +++- stepmania/src/ScreenStyleSplash.cpp | 3 ++- stepmania/src/ScreenTest.cpp | 4 +++- 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 33303fa623..3cb2a9ad94 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -182,6 +182,7 @@ TimerStealth=0 StyleIcon=1 MemoryCardIcons=1 NextScreen=ScreenSelectGroup +PrevScreen=ScreenTitleBranch SilentWait=1 BounceJoinMessage=1 FoldOnJoin=1 @@ -300,6 +301,7 @@ CharacterIconP2OffCommand=linear,0.3;diffusealpha,0;sleep,10 [ScreenStyleSplash] NextScreen=ScreenSelectGroup +PrevScreen=ScreenTitleBranch StyleIcon=0 MemoryCardIcons=0 TimerSeconds=0 @@ -920,6 +922,7 @@ NoSongsScreen=ScreenTitleBranch Fallback=ScreenWithMenuElements [ScreenEz2SelectMusic] +PrevScreen=ScreenTitleBranch UseModeSwitcher=0 BalloonX=SCREEN_CENTER_X+172 BalloonY=SCREEN_CENTER_Y-100 @@ -2248,6 +2251,7 @@ Line4=list,RandomModifiers [ScreenEditCoursesMenu] Fallback=ScreenWithMenuElements +NextScreen=ScreenTitleBranch ExplanationX=SCREEN_CENTER_X+0 ExplanationY=SCREEN_CENTER_Y+170 ExplanationOnCommand=wrapwidthpixels,900;zoom,0.7 @@ -3311,6 +3315,7 @@ PlayerP1OnePlayerTwoSidesX=SCREEN_CENTER_X PlayerP2OnePlayerTwoSidesX=SCREEN_CENTER_X [EditMenu] +PrevScreen=ScreenTitleBranch Arrows1X=SCREEN_CENTER_X-130 Arrows2X=SCREEN_CENTER_X+270 SongBannerX=SCREEN_CENTER_X+170 @@ -3868,6 +3873,8 @@ RandomModifiersDefault=mod,clear RandomModifiers,1=name,Off RandomModifiers,2=mod,random;name,Random +[ScreenReloadSongs] +NextScreen=ScreenTitleBranch [DancingCharacters] #2D Character X/Y positions in relation to the center diff --git a/stepmania/src/ScreenEditCoursesMenu.cpp b/stepmania/src/ScreenEditCoursesMenu.cpp index 3c6f6f861c..8039556745 100644 --- a/stepmania/src/ScreenEditCoursesMenu.cpp +++ b/stepmania/src/ScreenEditCoursesMenu.cpp @@ -12,6 +12,7 @@ #include "Steps.h" +#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen") #define EXPLANATION_TEXT THEME->GetMetric (m_sName,"ExplanationText") #define HELP_TEXT THEME->GetMetric (m_sName,"HelpText") @@ -50,7 +51,7 @@ void ScreenEditCoursesMenu::HandleScreenMessage( const ScreenMessage SM ) { case SM_GoToPrevScreen: case SM_GoToNextScreen: - SCREENMAN->SetNewScreen( "ScreenTitleBranch" ); + SCREENMAN->SetNewScreen( NEXT_SCREEN ); break; } } diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index faa913e479..02e4bdc484 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -13,6 +13,7 @@ #include "Steps.h" #include "song.h" +#define PREV_SCREEN THEME->GetMetric(m_sName,"PrevScreen") #define EXPLANATION_TEXT THEME->GetMetric(m_sName,"ExplanationText") #define HELP_TEXT THEME->GetMetric(m_sName,"HelpText") @@ -51,7 +52,7 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM ) m_Selector.RefreshNotes(); break; case SM_GoToPrevScreen: - SCREENMAN->SetNewScreen( "ScreenTitleBranch" ); + SCREENMAN->SetNewScreen( PREV_SCREEN ); break; case SM_GoToNextScreen: SCREENMAN->SetNewScreen( "ScreenEdit" ); diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index e823dc928f..3321701d1c 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -20,6 +20,7 @@ #include "PlayerState.h" #include "Command.h" +#define PREV_SCREEN THEME->GetMetric ("ScreenEz2SelectMusic","PrevScreen") #define SCROLLING_LIST_X THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListX") #define SCROLLING_LIST_Y THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListY") #define SCROLLING_LIST_ROT THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListRotation") @@ -374,7 +375,7 @@ void ScreenEz2SelectMusic::HandleScreenMessage( const ScreenMessage SM ) switch( SM ) { case SM_GoToPrevScreen: - SCREENMAN->SetNewScreen( "ScreenTitleBranch" ); + SCREENMAN->SetNewScreen( PREV_SCREEN ); break; case SM_GoToNextScreen: if( m_bGoToOptions ) @@ -388,7 +389,7 @@ void ScreenEz2SelectMusic::HandleScreenMessage( const ScreenMessage SM ) } break; case SM_NoSongs: - SCREENMAN->SetNewScreen( "ScreenTitleBranch" ); + SCREENMAN->SetNewScreen( PREV_SCREEN ); break; } diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index e8ddab8d28..212cd34d23 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -23,6 +23,7 @@ #define HELP_TEXT THEME->GetMetric("ScreenEz2SelectPlayer","HelpText") #define TIMER_SECONDS THEME->GetMetricI("ScreenEz2SelectPlayer","TimerSeconds") #define NEXT_SCREEN THEME->GetMetric("ScreenEz2SelectPlayer","NextScreen") +#define PREV_SCREEN THEME->GetMetric("ScreenEz2SelectPlayer","PrevScreen") #define SILENT_WAIT THEME->GetMetricB("ScreenEz2SelectPlayer","SilentWait") #define BOUNCE_JOIN_MESSAGE THEME->GetMetricB("ScreenEz2SelectPlayer","BounceJoinMessage") #define FOLD_ON_JOIN THEME->GetMetricB("ScreenEz2SelectPlayer","FoldOnJoin") @@ -148,7 +149,7 @@ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM ) break; case SM_GoToPrevScreen: SOUND->StopMusic(); - SCREENMAN->SetNewScreen( "ScreenTitleBranch" ); + SCREENMAN->SetNewScreen( PREV_SCREEN ); break; case SM_GoToNextScreen: SCREENMAN->SetNewScreen( NEXT_SCREEN ); diff --git a/stepmania/src/ScreenReloadSongs.cpp b/stepmania/src/ScreenReloadSongs.cpp index 8341a6cd7c..85d294fb1a 100644 --- a/stepmania/src/ScreenReloadSongs.cpp +++ b/stepmania/src/ScreenReloadSongs.cpp @@ -10,6 +10,8 @@ #include "arch/LoadingWindow/LoadingWindow.h" +#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen") + static const int DrawFrameRate = 20; class ScreenReloadSongsLoadingWindow: public LoadingWindow { @@ -74,7 +76,7 @@ void ScreenReloadSongs::Update( float fDeltaTime ) SONGMAN->Reload( m_LoadingWindow ); UNLOCKMAN->UpdateSongs(); - SCREENMAN->SetNewScreen( "ScreenTitleBranch" ); + SCREENMAN->SetNewScreen( NEXT_SCREEN ); } /* diff --git a/stepmania/src/ScreenStyleSplash.cpp b/stepmania/src/ScreenStyleSplash.cpp index b1d79c57c1..7bc180ba94 100644 --- a/stepmania/src/ScreenStyleSplash.cpp +++ b/stepmania/src/ScreenStyleSplash.cpp @@ -12,6 +12,7 @@ #include "Style.h" #define NEXT_SCREEN THEME->GetMetric("ScreenStyleSplash","NextScreen") +#define PREV_SCREEN THEME->GetMetric("ScreenStyleSplash","PrevScreen") #define NONSTOP_SCREEN THEME->GetMetric("ScreenStyleSplash","NonstopScreen") #define ONI_SCREEN THEME->GetMetric("ScreenStyleSplash","OniScreen") @@ -64,7 +65,7 @@ void ScreenStyleSplash::HandleScreenMessage( const ScreenMessage SM ) break; case SM_GoToPrevScreen: - SCREENMAN->SetNewScreen( "ScreenTitleBranch" ); + SCREENMAN->SetNewScreen( PREV_SCREEN ); break; case SM_GoToNextScreen: SCREENMAN->SetNewScreen( NEXT_SCREEN ); diff --git a/stepmania/src/ScreenTest.cpp b/stepmania/src/ScreenTest.cpp index a52ea04a31..e54ec7e721 100644 --- a/stepmania/src/ScreenTest.cpp +++ b/stepmania/src/ScreenTest.cpp @@ -5,6 +5,8 @@ #include "ScreenTestFonts.h" #include "ScreenManager.h" #include "GameSoundManager.h" +#include "ThemeManager.h" +#include "CommonMetrics.h" ScreenTest::~ScreenTest() @@ -53,7 +55,7 @@ void ScreenTest::Input( const DeviceInput& DeviceI, const InputEventType type, c if( DeviceI.button == KEY_ESC ) { if( type != IET_FIRST_PRESS ) return; - SCREENMAN->SetNewScreen( "ScreenTitleBranch" ); + SCREENMAN->SetNewScreen( INITIAL_SCREEN ); return; } }