diff options
| author | Travis Howell | 2005-03-12 11:06:07 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-03-12 11:06:07 +0000 |
| commit | 7ee1a2d4955d19010cf3520b75b0769ee3b48666 (patch) | |
| tree | 9ae1da4e108e3f9b8b53939a492d6bce5ab59766 /scumm | |
| parent | 7b3b253fba3c0884d2fe9a7c5f93447fcfd0560a (diff) | |
| download | scummvm-rg350-7ee1a2d4955d19010cf3520b75b0769ee3b48666.tar.gz scummvm-rg350-7ee1a2d4955d19010cf3520b75b0769ee3b48666.tar.bz2 scummvm-rg350-7ee1a2d4955d19010cf3520b75b0769ee3b48666.zip | |
Broke HE music looping
svn-id: r17089
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 01fdd86ac4..f665736b72 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -820,14 +820,14 @@ int Sound::isSoundRunning(int sound) const { // getSoundStatus(), with a -1, will return the // ID number of the first active music it finds. if (_currentMusic) - sound = _currentMusic; + return (_vm->_mixer->isSoundIDActive(_currentMusic) ? _currentMusic : 0); else if (_vm->_imuse) return (_vm->_imuse->getSoundStatus(sound)); } else if (sound >= 10000) { // TODO report sound ID on channel // channel = sound - 10000 if (sound == 10000) - return _currentMusic; + return (_vm->_mixer->isSoundIDActive(_currentMusic) ? _currentMusic : 0); else return 0; } |