diff options
| author | Paweł Kołodziejski | 2004-06-20 15:58:28 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-06-20 15:58:28 +0000 |
| commit | 24f5130de24ac7528a911153b7263819a3865888 (patch) | |
| tree | e16d55a661df6734f344a074be53026269ab91f2 | |
| parent | 92fce3fa4955fde4999943e4d251148bff988d7f (diff) | |
| download | scummvm-rg350-24f5130de24ac7528a911153b7263819a3865888.tar.gz scummvm-rg350-24f5130de24ac7528a911153b7263819a3865888.tar.bz2 scummvm-rg350-24f5130de24ac7528a911153b7263819a3865888.zip | |
better check if track is used
svn-id: r13976
| -rw-r--r-- | scumm/imuse_digi/dimuse_script.cpp | 2 | ||||
| -rw-r--r-- | scumm/imuse_digi/dimuse_track.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/imuse_digi/dimuse_script.cpp b/scumm/imuse_digi/dimuse_script.cpp index c372c9c034..9e4d000d28 100644 --- a/scumm/imuse_digi/dimuse_script.cpp +++ b/scumm/imuse_digi/dimuse_script.cpp @@ -269,7 +269,7 @@ int IMuseDigital::getSoundStatus(int sound) const { debug(5, "IMuseDigital::getSoundStatus(%d)", sound); for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { Track *track = _track[l]; - if ((track->soundId == sound) && track->handle.isActive()) { + if (track->used && (track->soundId == sound)) { return 1; } } diff --git a/scumm/imuse_digi/dimuse_track.cpp b/scumm/imuse_digi/dimuse_track.cpp index 612f5105ac..182afeda37 100644 --- a/scumm/imuse_digi/dimuse_track.cpp +++ b/scumm/imuse_digi/dimuse_track.cpp @@ -83,7 +83,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, Track *track = _track[l]; for (;;) { flushTracks(); - if (!track->used && !track->handle.isActive()) { + if (!track->used) { track->pan = 64; track->vol = volume * 1000; track->volFadeDest = 0; |