diff options
| author | Travis Howell | 2005-03-13 06:07:25 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-03-13 06:07:25 +0000 |
| commit | c9424192c497d7e32b62aa0f51ca019f2b1207c1 (patch) | |
| tree | e20b0137c7737755159165ed09bd68378fba4c06 | |
| parent | fa2a936565d09e662d9449aa703e538ccf5d29d5 (diff) | |
| download | scummvm-rg350-c9424192c497d7e32b62aa0f51ca019f2b1207c1.tar.gz scummvm-rg350-c9424192c497d7e32b62aa0f51ca019f2b1207c1.tar.bz2 scummvm-rg350-c9424192c497d7e32b62aa0f51ca019f2b1207c1.zip | |
Fix spyozon regression
svn-id: r17113
| -rw-r--r-- | scumm/sound.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index e6bbd889df..2335d6a324 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -815,7 +815,7 @@ int Sound::isSoundRunning(int sound) const { if (_vm->_features & GF_HUMONGOUS) { if (sound == -2) { - return -1; + return !isSfxFinished(); } else if (sound == -1) { // getSoundStatus(), with a -1, will return the // ID number of the first active music it finds. @@ -828,6 +828,8 @@ int Sound::isSoundRunning(int sound) const { // channel = sound - 10000 if (sound == 10000) return (_vm->_mixer->isSoundIDActive(_currentMusic) ? _currentMusic : 0); + else if (sound == 10001) + return _vm->_mixer->isSoundHandleActive(_talkChannelHandle); else return 0; } |