Ticket #6097: puttzoo.diff

File puttzoo.diff, 1.1 KB (added by Kirben, 6 years ago)
  • engines/scumm/script_v6.cpp

    diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
    index d2f4133..4abbd81 100644
    a b void ScummEngine_v6::o6_ifNot() {  
    707707void ScummEngine_v6::o6_jump() {
    708708        int offset = fetchScriptWordSigned();
    709709
     710        // WORKAROUND bug #6097: Pressing escape at the lake side entrance of the cave
     711        // while Putt Putt is not on solid ground and still talking will cause the raft
     712        // to disappear. This is a script bug in the original game.
     713        if (_game.id == GID_PUTTZOO && (_game.features & GF_HE_985 || _game.heversion == 99)) {
     714                if (vm.slot[_currentScript].number == 2054 && offset == 178 && !isScriptRunning(2050))
     715                        _scummVars[202] = 35;
     716                if (vm.slot[_currentScript].number == 206 && offset == 176 && !isScriptRunning(202))
     717                        _scummVars[202] = 35;           
     718        }
     719
    710720        // WORKAROUND bug #2826144: Talking to the guard at the bigfoot party, after
    711721        // he's let you inside, will cause the game to hang, if you end the conversation.
    712722        // This is a script bug, due to a missing jump in one segment of the script.