From 43e333caefb7455dc06dc1e88df007fa89f8c842 Mon Sep 17 00:00:00 2001 From: Charles Lohr Date: Wed, 3 Nov 2004 05:31:09 +0000 Subject: [PATCH] Fix: Allow ScreenStage to go "back" properly. --- stepmania/Themes/default/metrics.ini | 1 + stepmania/src/ScreenStage.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 82bd0a33d2..e1ce4f393c 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -925,6 +925,7 @@ NextScreen2=screen,ScreenStage [ScreenStage] NextScreen=ScreenGameplay +PrevScreen=ScreenBranchSelectSongOrCourse // This is the minimum delay after the "in" transition before the // "out" transition will begin. (NextScreen is loaded during this // time.) diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp index 83393ca867..a7a47f791f 100644 --- a/stepmania/src/ScreenStage.cpp +++ b/stepmania/src/ScreenStage.cpp @@ -16,6 +16,7 @@ #include "song.h" #define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen") +#define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen") #define MINIMUM_DELAY THEME->GetMetricF(m_sName,"MinimumDelay") #define SHOW_BANNER THEME->GetMetricB(m_sName,"ShowBanner") @@ -131,7 +132,7 @@ void ScreenStage::HandleScreenMessage( const ScreenMessage SM ) break; case SM_GoToPrevScreen: SCREENMAN->DeletePreppedScreen(); - SCREENMAN->SetNewScreen( "ScreenSelectMusic" ); + SCREENMAN->SetNewScreen( PREV_SCREEN ); break; } }