aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound/music.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2013-09-21 09:30:42 +0200
committerWillem Jan Palenstijn2013-09-21 09:31:08 +0200
commit3792af8e955bea5a07359c808361a16b15481327 (patch)
tree5a50228ce36d0fbd576473345e5982b0e602ed3b /engines/sci/sound/music.cpp
parent11d425b76c7d6cdae8b72a1c3c438cc74e9c37a0 (diff)
downloadscummvm-rg350-3792af8e955bea5a07359c808361a16b15481327.tar.gz
scummvm-rg350-3792af8e955bea5a07359c808361a16b15481327.tar.bz2
scummvm-rg350-3792af8e955bea5a07359c808361a16b15481327.zip
AUDIO: Simplify SCI inFastForward flag by moving it to MidiParser
Diffstat (limited to 'engines/sci/sound/music.cpp')
-rw-r--r--engines/sci/sound/music.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 1628a22386..8c6d0d6431 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -521,11 +521,7 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
pSnd->pMidiParser->jumpToTick(0);
else {
// Fast forward to the last position and perform associated events when loading
- pSnd->inFastForward = true;
- // we set this flag, so that the midiparser doesn't set any signals for scripts
- // if we don't do this, at least accessing the debugger will reset previously set signals
pSnd->pMidiParser->jumpToTick(pSnd->ticker, true, true, true);
- pSnd->inFastForward = false;
}
// Restore looping and hold
@@ -765,7 +761,6 @@ MusicEntry::MusicEntry() {
resourceId = 0;
isQueued = false;
- inFastForward = false;
dataInc = 0;
ticker = 0;