Merge pull request #902 from segrax/Fix_4556

SCUMM: Fix bug #4556 (Maniac: Purple Tentacle appears in Lab after being chased out)

1 files changed, 19 insertions, 0 deletions

diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 8160c5e30a..822e32d9c4 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1188,6 +1188,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);
 }