[Scummvm-git-logs] scummvm master -> 085332a3dc8b006144f46b47b77d888d5ba9e467

sev- sev at scummvm.org
Tue Feb 21 23:33:21 CET 2017


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
165a1bb070 SCUMM: Fix bug #4556 (Maniac C64/V1/V2: Purple Tentacle appears in Lab Entry after being chased out)
085332a3dc Merge pull request #902 from segrax/Fix_4556


Commit: 165a1bb0702232b5b7852f6236df9d4e052744be
    https://github.com/scummvm/scummvm/commit/165a1bb0702232b5b7852f6236df9d4e052744be
Author: Robert Crossfield (robcrossfield at gmail.com)
Date: 2017-02-13T17:51:00+11:00

Commit Message:
SCUMM: Fix bug #4556 (Maniac C64/V1/V2: Purple Tentacle appears in Lab Entry after being chased out)

Changed paths:
    engines/scumm/script_v2.cpp


diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 756e0b4..d7f9916 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);
 }
 


Commit: 085332a3dc8b006144f46b47b77d888d5ba9e467
    https://github.com/scummvm/scummvm/commit/085332a3dc8b006144f46b47b77d888d5ba9e467
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-21T23:33:17+01:00

Commit Message:
Merge pull request #902 from segrax/Fix_4556

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

Changed paths:
    engines/scumm/script_v2.cpp







More information about the Scummvm-git-logs mailing list