libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-21 01:08:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Music regression in some HE games.

Browse Source 
svn-id: r16705
This commit is contained in:
Travis Howell 2005-01-30 09:11:38 +00:00
parent a05b4a5e2d
commit 0199bf70fe
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scumm/sound.cpp
View File

@ -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)