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

use GetNextScreen()

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-22 09:12:16 +00:00
parent 86f3b4a6b5
commit 8050631be9
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenAttract.cpp
+3 -4
View File
@@ -14,7 +14,6 @@
#include "GameSoundManager.h" #include "GameSoundManager.h"
#include "CommonMetrics.h" #include "CommonMetrics.h"
#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen")
#define START_SCREEN(sScreenName) THEME->GetMetric (sScreenName,"StartScreen") #define START_SCREEN(sScreenName) THEME->GetMetric (sScreenName,"StartScreen")
ThemeMetric<bool> BACK_GOES_TO_START_SCREEN( "ScreenAttract", "BackGoesToStartScreen" ); ThemeMetric<bool> 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. */ * going to interrupt it when we fade in, stop the old music before we fade out. */
bool bMusicChanging = false; bool bMusicChanging = false;
if( PLAY_MUSIC ) 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 ) if( bMusicChanging )
SOUND->PlayMusic( "" ); // stop the music SOUND->PlayMusic( "" ); // stop the music
SCREENMAN->SetNewScreen( NEXT_SCREEN );
} }
ScreenWithMenuElements::HandleScreenMessage( SM );
} }
void ScreenAttract::GoToStartScreen( CString sScreenName ) void ScreenAttract::GoToStartScreen( CString sScreenName )