aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorBen Castricum2016-08-21 20:46:28 +0200
committerBen Castricum2016-08-30 09:07:30 +0200
commitb9b96e8991bcdd4e61dc56b7d0a5afc4d80d225d (patch)
treee8607b8fa1709a228adbe8a48acac7c8a3d3b368 /engines/scumm
parent13f810f57f8661ad3af567277abcf5da31f32bb0 (diff)
downloadscummvm-rg350-b9b96e8991bcdd4e61dc56b7d0a5afc4d80d225d.tar.gz
scummvm-rg350-b9b96e8991bcdd4e61dc56b7d0a5afc4d80d225d.tar.bz2
scummvm-rg350-b9b96e8991bcdd4e61dc56b7d0a5afc4d80d225d.zip
SCUMM: Correct the raft position for PUTTZOO, fixes bug #6097
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/script_v6.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 6c81f17f2f..62c62c0b4a 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -707,6 +707,17 @@ void ScummEngine_v6::o6_ifNot() {
void ScummEngine_v6::o6_jump() {
int offset = fetchScriptWordSigned();
+ // WORKAROUND bug #6097: Pressing escape at the lake side entrance of
+ // the cave while Putt Putt is not on solid ground and still talking
+ // will cause the raft to disappear. This is a script bug in the
+ // original game and affects several versions.
+ if (_game.id == GID_PUTTZOO) {
+ if (_game.heversion == 73 && vm.slot[_currentScript].number == 206 && offset == 176 && !isScriptRunning(202))
+ _scummVars[244] = 35;
+ if (_game.features & GF_HE_985 && vm.slot[_currentScript].number == 2054 && offset == 178 && !isScriptRunning(2050))
+ _scummVars[202] = 35;
+ }
+
// WORKAROUND bug #2826144: Talking to the guard at the bigfoot party, after
// he's let you inside, will cause the game to hang, if you end the conversation.
// This is a script bug, due to a missing jump in one segment of the script.