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

don't stop music if the next Attract screen is playing the same sound

Browse Source
This commit is contained in:
Chris Danford
2004-02-01 23:07:13 +00:00
parent 1620f209b8
commit 0bff292827
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenAttract.cpp
+8 -2
View File
@@ -156,7 +156,7 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM )
m_Out.StartTransitioning( SM_GoToNextScreen ); m_Out.StartTransitioning( SM_GoToNextScreen );
break; break;
case SM_GoToNextScreen: case SM_GoToNextScreen:
/* XXX: Look at the def of the screen we're going to; if it has a /* 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 * music theme element and it's the same as the one we're playing
* now, don't stop. (However, if we're going to interrupt it * now, don't stop. (However, if we're going to interrupt it
* when we fade in, it's cleaner to stop it before we fade out.) */ * when we fade in, it's cleaner to stop it before we fade out.) */
@@ -167,7 +167,13 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM )
/* But if you don't stop it, for screens that have their own unique /* But if you don't stop it, for screens that have their own unique
* music, it will constantly loop even after the screen has gone on * music, it will constantly loop even after the screen has gone on
* to the next attract screen. -- Miryokuteki */ * to the next attract screen. -- Miryokuteki */
SOUND->PlayMusic( "" ); bool bGoingToPlayTheSameMusic =
THEME->GetPathToS( NEXT_SCREEN, "music", false) == THEME->GetPathToS( m_sName, "music", false);
if( bGoingToPlayTheSameMusic )
; // do nothing
else
SOUND->PlayMusic( "" ); // stop the music
SCREENMAN->SetNewScreen( NEXT_SCREEN ); SCREENMAN->SetNewScreen( NEXT_SCREEN );
break; break;
} }