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

SCI: Fix bug #3605269 - "SCI: KQ5 Windows CD - Game Hangs Before Final Battle"

Browse source 
This is caused because songs 1840, 1843 and 1849 are all missing their special
SCI signaling channel (channel 15), so the game scripts wait indefinitely for
signals which are never set
This commit is contained in:
Filippos Karapetis 2013-04-01 21:23:44 +03:00
parent f81ce4d228
commit 2e93ee2b83
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/sci/sound/soundcmd.cpp
View file

@ -177,6 +177,18 @@ void SoundCommandParser::processPlaySound(reg_t obj) {
writeSelectorValue(_segMan, obj, SELECTOR(state), kSoundPlaying); writeSelectorValue(_segMan, obj, SELECTOR(state), kSoundPlaying);
} }
// WORKAROUND: Songs 1840, 1843 and 1849 in the Windows version of KQ5CD
// are all missing their channel 15 (all played during its ending
// sequences, when fighting with Mordack). This makes the game scripts
// wait indefinitely for the missing signals in these songs. In the
// original interpreter, this bug manifests as an "Out of heap" error. We
// signal the game scripts to stop waiting forever by setting the song's
// dataInc selector to something other than 0. This causes Mordack's
// appearing animation to occur a bit earlier than expected, but at least
// the game doesn't freeze at that point. Fixes bug #3605269.
if (g_sci->getGameId() == GID_KQ5 && (resourceId == 1840 || resourceId == 1843 || resourceId == 1849))
writeSelectorValue(_segMan, obj, SELECTOR(dataInc), 1);
musicSlot->loop = readSelectorValue(_segMan, obj, SELECTOR(loop)); musicSlot->loop = readSelectorValue(_segMan, obj, SELECTOR(loop));
musicSlot->priority = readSelectorValue(_segMan, obj, SELECTOR(priority)); musicSlot->priority = readSelectorValue(_segMan, obj, SELECTOR(priority));
// Reset hold when starting a new song. kDoSoundSetHold is always called after // Reset hold when starting a new song. kDoSoundSetHold is always called after