diff options
| author | Travis Howell | 2006-02-16 08:47:19 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-02-16 08:47:19 +0000 |
| commit | 37cc74db399861b82818ca335203d872204be064 (patch) | |
| tree | 24317a3c13fa4ad0cc6b620ad84f00197c52649a | |
| parent | 903daa72526b4f702681fcd9e1ed643214aa0692 (diff) | |
| download | scummvm-rg350-37cc74db399861b82818ca335203d872204be064.tar.gz scummvm-rg350-37cc74db399861b82818ca335203d872204be064.tar.bz2 scummvm-rg350-37cc74db399861b82818ca335203d872204be064.zip | |
Use simplier method of checking sound status in HE60/61 games
svn-id: r20723
| -rw-r--r-- | engines/scumm/sound.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 9b69f2f015..128c77bece 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -732,14 +732,9 @@ int Sound::isSoundRunning(int sound) const { } } else if (_vm->_heversion >= 60) { if (sound == -2) { - return _vm->_mixer->getSoundID(_heSoundChannels[0]); + sound = _heChannel[0].sound; } else if (sound == -1) { - if (_vm->_platform == Common::kPlatform3DO) { - return _vm->_mixer->isSoundIDActive(_currentMusic); - } else { - if (_vm->_imuse) - return _vm->_imuse->getSoundStatus(_currentMusic); - } + sound = _currentMusic; } } |