diff options
author | Paweł Kołodziejski | 2004-06-20 21:01:32 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2004-06-20 21:01:32 +0000 |
commit | 8b789937c6d02f7043ab5d490ebf9a7baae9aae9 (patch) | |
tree | 3e57d59f21bb37a624e1533a0842d9fa80cc64c3 /scumm/imuse_digi | |
parent | 80216dc6d672e7a8d65496971b3adb3ae308192b (diff) | |
download | scummvm-rg350-8b789937c6d02f7043ab5d490ebf9a7baae9aae9.tar.gz scummvm-rg350-8b789937c6d02f7043ab5d490ebf9a7baae9aae9.tar.bz2 scummvm-rg350-8b789937c6d02f7043ab5d490ebf9a7baae9aae9.zip |
changed check to _insaneRunning
svn-id: r13986
Diffstat (limited to 'scumm/imuse_digi')
-rw-r--r-- | scumm/imuse_digi/dimuse_script.cpp | 4 | ||||
-rw-r--r-- | scumm/imuse_digi/dimuse_track.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scumm/imuse_digi/dimuse_script.cpp b/scumm/imuse_digi/dimuse_script.cpp index 2209ff023c..64a2e384e4 100644 --- a/scumm/imuse_digi/dimuse_script.cpp +++ b/scumm/imuse_digi/dimuse_script.cpp @@ -163,8 +163,7 @@ void IMuseDigital::flushTracks() { debug(5, "flushTracks()"); for (int l = 0; l < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; l++) { Track *track = _track[l]; - if (track->used && - (track->readyToRemove || (!_vm->_videoFinished && track->toBeRemoved))) { + if (track->used && (track->readyToRemove || (_vm->_insaneRunning && track->toBeRemoved))) { if ((track->stream) && (!track->stream->endOfStream())) { track->stream->finish(); } else if ((track->stream) && (track->stream->endOfStream())) { @@ -375,6 +374,7 @@ void IMuseDigital::stopAllSounds() { if (!foundNotRemoved) break; flushTracks(); + _vm->_system->delay_msecs(50); } } diff --git a/scumm/imuse_digi/dimuse_track.cpp b/scumm/imuse_digi/dimuse_track.cpp index 0b24a894a3..bbdae9d127 100644 --- a/scumm/imuse_digi/dimuse_track.cpp +++ b/scumm/imuse_digi/dimuse_track.cpp @@ -179,6 +179,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, track->used = true; return; } + _vm->_system->delay_msecs(50); } } |