diff options
| author | Travis Howell | 2006-04-26 10:34:34 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-04-26 10:34:34 +0000 |
| commit | 5ceb4b19b0b31556d29289381a5bb007e05c9c46 (patch) | |
| tree | e8b47db8222029daf59c20be8a2a815d68f1713f /engines | |
| parent | a28250d6608a897f4ad34b7c6c1463104aa6ae83 (diff) | |
| download | scummvm-rg350-5ceb4b19b0b31556d29289381a5bb007e05c9c46.tar.gz scummvm-rg350-5ceb4b19b0b31556d29289381a5bb007e05c9c46.tar.bz2 scummvm-rg350-5ceb4b19b0b31556d29289381a5bb007e05c9c46.zip | |
isSoundRunning always returns sound id in HE games
svn-id: r22176
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/he/sound_he.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index af17ed6ac0..9519087efe 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -123,7 +123,16 @@ int SoundHE::isSoundRunning(int sound) const { } } - return Sound::isSoundRunning(sound); + if (_vm->_mixer->isSoundIDActive(sound)) + return sound; + + if (isSoundInQueue(sound)) + return sound; + + if (_vm->_musicEngine &&_vm->_musicEngine->getSoundStatus(sound)) + return sound; + + return 0; } void SoundHE::stopSound(int sound) { |