thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unfortunately still not perfect.

Browse source 
svn-id: r15460
This commit is contained in:
Travis Howell 2004-10-08 01:07:44 +00:00
parent 9fdd43e25e
commit 39fad0387b
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scumm/script.cpp
View file

@ -695,7 +695,8 @@ void ScummEngine::stopObjectCode() {
ss->cutsceneOverride = 0; ss->cutsceneOverride = 0;
} }
} }
nukeArrays(ss->number); // FIXME Sometimes nukes the incorrect array in HE games
// nukeArrays(ss->number);
ss->number = 0; ss->number = 0;
ss->status = ssDead; ss->status = ssDead;
_currentScript = 0xFF; _currentScript = 0xFF;

2
scumm/sound.cpp
View file

@ -767,6 +767,8 @@ int Sound::isSoundRunning(int sound) const {
return (_musicChannelHandle.isActive()) ? 1 : 0; return (_musicChannelHandle.isActive()) ? 1 : 0;
else if (_vm->_imuse) else if (_vm->_imuse)
return (_vm->_imuse->getSoundStatus(sound)); return (_vm->_imuse->getSoundStatus(sound));
} else if (sound > _vm->_numSounds) {
return _vm->_mixer->isSoundIDActive(sound);
} }
} }