From 8050631be9c41ff585b155b22c5a8dd9564dae95 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 22 Jul 2005 09:12:16 +0000 Subject: [PATCH] use GetNextScreen() --- stepmania/src/ScreenAttract.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp index 17611271a4..9991b8e505 100644 --- a/stepmania/src/ScreenAttract.cpp +++ b/stepmania/src/ScreenAttract.cpp @@ -14,7 +14,6 @@ #include "GameSoundManager.h" #include "CommonMetrics.h" -#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen") #define START_SCREEN(sScreenName) THEME->GetMetric (sScreenName,"StartScreen") ThemeMetric BACK_GOES_TO_START_SCREEN( "ScreenAttract", "BackGoesToStartScreen" ); @@ -128,13 +127,13 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM ) * going to interrupt it when we fade in, stop the old music before we fade out. */ bool bMusicChanging = false; if( PLAY_MUSIC ) - bMusicChanging = THEME->GetPathS(m_sName,"music") != THEME->GetPathS(NEXT_SCREEN,"music",true); // GetPath optional on the next screen because it may not have music. + bMusicChanging = THEME->GetPathS(m_sName,"music") != THEME->GetPathS(GetNextScreen(),"music",true); // GetPath optional on the next screen because it may not have music. if( bMusicChanging ) SOUND->PlayMusic( "" ); // stop the music - - SCREENMAN->SetNewScreen( NEXT_SCREEN ); } + + ScreenWithMenuElements::HandleScreenMessage( SM ); } void ScreenAttract::GoToStartScreen( CString sScreenName )