diff options
| author | Travis Howell | 2009-07-24 12:28:53 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-07-24 12:28:53 +0000 |
| commit | 171061894b8dd1903ab2dbe212b2e4ea7690b9d5 (patch) | |
| tree | 1eb896879c3f89aa0de93afd8901a6b9cbae778a /engines/scumm/script_v6.cpp | |
| parent | c78ed9e4233b80ecd2706d0ffda01fd069a6e6ef (diff) | |
| download | scummvm-rg350-171061894b8dd1903ab2dbe212b2e4ea7690b9d5.tar.gz scummvm-rg350-171061894b8dd1903ab2dbe212b2e4ea7690b9d5.tar.bz2 scummvm-rg350-171061894b8dd1903ab2dbe212b2e4ea7690b9d5.zip | |
Add workaround for bug #2826144 - SAM: Game hangs when talking to bigfoot guard.
svn-id: r42693
Diffstat (limited to 'engines/scumm/script_v6.cpp')
| -rw-r--r-- | engines/scumm/script_v6.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index dcd60352c7..c01d573a79 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -701,6 +701,14 @@ void ScummEngine_v6::o6_ifNot() { void ScummEngine_v6::o6_jump() { int offset = fetchScriptWordSigned(); + + // 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. + if (_game.id == GID_SAMNMAX && vm.slot[_currentScript].number == 101 && readVar(0x8000 + 97) == 1 && offset == 1) { + offset = 1984; + } + _scriptPointer += offset; } |