diff options
| author | Eugene Sandulenko | 2016-09-02 23:38:39 +0200 |
|---|---|---|
| committer | GitHub | 2016-09-02 23:38:39 +0200 |
| commit | d4f9c0e361cb85d9674e44c6762722ac84be0d2d (patch) | |
| tree | f16198b1c64d042dadf07de1c06ade0248b4ccfd /engines/scumm/script_v6.cpp | |
| parent | 3c619d85890f540e4bbb8da24779987bee315dfd (diff) | |
| parent | 940bb41526da8e16889effc803f029128043b5d8 (diff) | |
| download | scummvm-rg350-d4f9c0e361cb85d9674e44c6762722ac84be0d2d.tar.gz scummvm-rg350-d4f9c0e361cb85d9674e44c6762722ac84be0d2d.tar.bz2 scummvm-rg350-d4f9c0e361cb85d9674e44c6762722ac84be0d2d.zip | |
Merge pull request #821 from BenCastricum/bugfixes
SCUMM: Bugfixes
Diffstat (limited to 'engines/scumm/script_v6.cpp')
| -rw-r--r-- | engines/scumm/script_v6.cpp | 11 |
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. |