aboutsummaryrefslogtreecommitdiff
path: root/scumm/imuse_digi
diff options
context:
space:
mode:
authorPaweł Kołodziejski2006-01-28 20:13:53 +0000
committerPaweł Kołodziejski2006-01-28 20:13:53 +0000
commit8911b6b94e10fd3e11ce63e0706e11f37a7f1dc5 (patch)
tree689749c9706e72cf45940cd1f27da4ed7e40ee55 /scumm/imuse_digi
parent91d253c5b142b751fea3596b519d0eb0efb0c6a0 (diff)
downloadscummvm-rg350-8911b6b94e10fd3e11ce63e0706e11f37a7f1dc5.tar.gz
scummvm-rg350-8911b6b94e10fd3e11ce63e0706e11f37a7f1dc5.tar.bz2
scummvm-rg350-8911b6b94e10fd3e11ce63e0706e11f37a7f1dc5.zip
revert, that is still needed anyway
svn-id: r20272
Diffstat (limited to 'scumm/imuse_digi')
-rw-r--r--scumm/imuse_digi/dimuse_track.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/scumm/imuse_digi/dimuse_track.cpp b/scumm/imuse_digi/dimuse_track.cpp
index 38de38fd72..7e8711f6c0 100644
--- a/scumm/imuse_digi/dimuse_track.cpp
+++ b/scumm/imuse_digi/dimuse_track.cpp
@@ -75,8 +75,11 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType,
}
Track *track = _track[l];
- flushTracks();
- assert(!track->used);
+ while (track->used) {
+ // The designated track is not yet available. So, we call flushTracks()
+ // to get it processed (and thus made ready for us).
+ flushTracks();
+ }
track->pan = 64;
track->vol = volume * 1000;
track->volFadeDest = 0;