diff options
| author | Max Horn | 2008-01-05 20:50:10 +0000 |
|---|---|---|
| committer | Max Horn | 2008-01-05 20:50:10 +0000 |
| commit | 077026e088f7805304b9bd1d5a69b3f743f19145 (patch) | |
| tree | 06b9bcee470a03182c3468b038a65bb17d34da7b /engines/scumm | |
| parent | 8b12998c72409743139f694ae7a23722a8052082 (diff) | |
| download | scummvm-rg350-077026e088f7805304b9bd1d5a69b3f743f19145.tar.gz scummvm-rg350-077026e088f7805304b9bd1d5a69b3f743f19145.tar.bz2 scummvm-rg350-077026e088f7805304b9bd1d5a69b3f743f19145.zip | |
As far as I can tell / understand, IMuseDigital::getSoundStatus can safely just use isSoundHandleActive for both stream and streamSou (warning: might cause regressions)
svn-id: r30258
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_script.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp index f663d1c628..d4036f167f 100644 --- a/engines/scumm/imuse_digi/dimuse_script.cpp +++ b/engines/scumm/imuse_digi/dimuse_script.cpp @@ -294,9 +294,8 @@ int IMuseDigital::getSoundStatus(int sound) const { for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { Track *track = _track[l]; if (track->soundId == sound) { - if ((track->streamSou && _mixer->isSoundHandleActive(track->mixChanHandle)) || - (track->stream && !track->stream->endOfStream())) { - return 1; + if (_mixer->isSoundHandleActive(track->mixChanHandle)) { + return 1; } } } |