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

always stop music and reset m_bPastHereWeGo when changing modes

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-21 06:25:29 +00:00
parent 5a59d42b6d
commit f4cc57514e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+4 -5
View File
@@ -1754,8 +1754,11 @@ void ScreenEdit::TransitionEditState( EditState em )
{ {
EditState old = m_EditState; EditState old = m_EditState;
/* If we're playing sample music when changing modes, stop it. */ /* If we're playing music, sample music or assist ticks when changing modes, stop. */
SOUND->PlayMusic(""); SOUND->PlayMusic("");
m_soundMusic.StopPlaying();
m_soundAssistTick.StopPlaying();
GAMESTATE->m_bPastHereWeGo = false;
// If exiting EDIT mode, save the cursor position. // If exiting EDIT mode, save the cursor position.
if( old == STATE_EDITING ) if( old == STATE_EDITING )
@@ -1776,10 +1779,6 @@ void ScreenEdit::TransitionEditState( EditState em )
m_Background.Unload(); m_Background.Unload();
m_Foreground.Unload(); m_Foreground.Unload();
GAMESTATE->m_bPastHereWeGo = false;
m_soundMusic.StopPlaying();
m_soundAssistTick.StopPlaying(); /* Stop any queued assist ticks. */
/* Restore the cursor position. */ /* Restore the cursor position. */
GAMESTATE->m_fSongBeat = m_fBeatToReturnTo; GAMESTATE->m_fSongBeat = m_fBeatToReturnTo;