aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/script_v2.cpp
diff options
context:
space:
mode:
authorRobert Crossfield2017-02-13 17:49:26 +1100
committerRobert Crossfield2017-02-13 17:51:00 +1100
commit165a1bb0702232b5b7852f6236df9d4e052744be (patch)
tree844879c709d3b21f8b85bfc62b15862a1a86b2f3 /engines/scumm/script_v2.cpp
parent59d6feb9f89be24ffe27d24cc07c463dc7bfded0 (diff)
downloadscummvm-rg350-165a1bb0702232b5b7852f6236df9d4e052744be.tar.gz
scummvm-rg350-165a1bb0702232b5b7852f6236df9d4e052744be.tar.bz2
scummvm-rg350-165a1bb0702232b5b7852f6236df9d4e052744be.zip
SCUMM: Fix bug #4556 (Maniac C64/V1/V2: Purple Tentacle appears in Lab Entry after being chased out)
Diffstat (limited to 'engines/scumm/script_v2.cpp')
-rw-r--r--engines/scumm/script_v2.cpp19
1 files changed, 19 insertions, 0 deletions
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 756e0b44de..d7f99167ad 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1189,6 +1189,25 @@ void ScummEngine_v2::o2_startScript() {
}
}
+ // WORKAROUND bug #4556: Purple Tentacle can appear in the lab, after being
+ // chased out and end up stuck in the room. This bug is triggered if the player
+ // enters the lab within 45 minutes of first entering the mansion and has chased Purple Tentacle
+ // out. Eventually the cutscene with Purple Tentacle chasing Sandy in the lab
+ // will play. This script leaves Purple Tentacle in the room causing him to become
+ // a permanent resident.
+ // Our fix is simply to prevent the Cutscene playing, if the lab has already been stormed
+ if (_game.id == GID_MANIAC) {
+ if (_game.version >= 1 && script == 155) {
+ if (VAR(120) == 1)
+ return;
+ }
+ // Script numbers are different in V0
+ if (_game.version == 0 && script == 150) {
+ if (VAR(104) == 1)
+ return;
+ }
+ }
+
runScript(script, 0, 0, 0);
}