always stop music and reset m_bPastHereWeGo when changing modes
This commit is contained in:
@@ -1754,8 +1754,11 @@ void ScreenEdit::TransitionEditState( EditState em )
|
||||
{
|
||||
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("");
|
||||
m_soundMusic.StopPlaying();
|
||||
m_soundAssistTick.StopPlaying();
|
||||
GAMESTATE->m_bPastHereWeGo = false;
|
||||
|
||||
// If exiting EDIT mode, save the cursor position.
|
||||
if( old == STATE_EDITING )
|
||||
@@ -1776,10 +1779,6 @@ void ScreenEdit::TransitionEditState( EditState em )
|
||||
m_Background.Unload();
|
||||
m_Foreground.Unload();
|
||||
|
||||
GAMESTATE->m_bPastHereWeGo = false;
|
||||
m_soundMusic.StopPlaying();
|
||||
m_soundAssistTick.StopPlaying(); /* Stop any queued assist ticks. */
|
||||
|
||||
/* Restore the cursor position. */
|
||||
GAMESTATE->m_fSongBeat = m_fBeatToReturnTo;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user