fix ScreenAttract looks for music even if PLAY_MUSIC=0
This commit is contained in:
@@ -133,8 +133,11 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
/* Look at the def of the screen we're going to; if it has a music theme element
|
/* Look at the def of the screen we're going to; if it has a music theme element
|
||||||
* and it's the same as the one we're playing now, don't stop. However, if we're
|
* and it's the same as the one we're playing now, don't stop. However, if we're
|
||||||
* 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 bGoingToPlayTheSameMusic =
|
/* GetPath optional because this screen and the next screen may not have music -
|
||||||
THEME->GetPathS( NEXT_SCREEN, "music", false) == THEME->GetPathS( m_sName, "music", false);
|
* if PLAY_MUSIC == 0. We can't access PLAY_MUSIC from here. */
|
||||||
|
CString sThisMusic = THEME->GetPathS( NEXT_SCREEN, "music", true );
|
||||||
|
CString sNextMusic = THEME->GetPathS( m_sName, "music", true );
|
||||||
|
bool bGoingToPlayTheSameMusic = sThisMusic == sNextMusic;
|
||||||
if( bGoingToPlayTheSameMusic )
|
if( bGoingToPlayTheSameMusic )
|
||||||
; // do nothing
|
; // do nothing
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user