diff options
| author | Travis Howell | 2005-01-30 09:11:38 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-01-30 09:11:38 +0000 |
| commit | 0199bf70fe9e5d94666b876eaa5dbab3bf5008d8 (patch) | |
| tree | 1b169e68564fe5a5989b60717a6accb49b90e090 /scumm | |
| parent | a05b4a5e2dbd540a637c022fd0d9317e0386dbe0 (diff) | |
| download | scummvm-rg350-0199bf70fe9e5d94666b876eaa5dbab3bf5008d8.tar.gz scummvm-rg350-0199bf70fe9e5d94666b876eaa5dbab3bf5008d8.tar.bz2 scummvm-rg350-0199bf70fe9e5d94666b876eaa5dbab3bf5008d8.zip | |
Music regression in some HE games.
svn-id: r16705
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/sound.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index cadeb61098..43cbcb5b65 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -821,11 +821,9 @@ int Sound::isSoundRunning(int sound) const { // getSoundStatus(), with a -1, will return the // ID number of the first active music it finds. if (_vm->_heversion >= 70 || _currentMusic) - return (_musicChannelHandle.isActive()) ? 1 : 0; + return (_musicChannelHandle.isActive()); else if (_vm->_imuse) return (_vm->_imuse->getSoundStatus(sound)); - } else if (sound > _vm->_numSounds) { - return _vm->_mixer->isSoundIDActive(sound); } } @@ -835,7 +833,7 @@ int Sound::isSoundRunning(int sound) const { if (isSoundInQueue(sound)) return 1; - if (!_vm->isResourceLoaded(rtSound, sound)) + if (sound > _vm->_numSounds || !_vm->isResourceLoaded(rtSound, sound)) return 0; if (_vm->_musicEngine) |