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

SCUMM: Unify WORKAROUND usage and complete/tweak some of them

Browse source
This commit is contained in:
Donovan Watteau 2022-08-07 17:24:27 +02:00
parent 6bd7a4cc14
commit 4ec06a2bf6
7 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engines/scumm/script_v2.cpp
View file

@ -1154,7 +1154,10 @@ void ScummEngine_v2::o2_walkActorTo() {
int act = getVarOrDirectByte(PARAM_1);
// WORKAROUND bug #2110
// WORKAROUND bug #2110: crash when trying to fly back to San Francisco.
// walkActorTo() is called with an invalid actor number by script 115,
// after the room is loaded. The original DOS interpreter probably let
// this slip by.
if (_game.id == GID_ZAK && _game.version == 1 && vm.slot[_currentScript].number == 115 && act == 249) {
act = VAR(VAR_EGO);
}
@ -1252,7 +1255,7 @@ void ScummEngine_v2::o2_startScript() {
}
void ScummEngine_v2::stopScriptCommon(int script) {
// WORKAROUND bug #4112: If you enter the lab while Dr. Fred has the powered turned off
// WORKAROUND bug #4112: If you enter the lab while Dr. Fred has the power turned off
// to repair the Zom-B-Matic, the script will be stopped and the power will never turn
// back on. This fix forces the power on, when the player enters the lab,
// if the script which turned it off is running