[Scummvm-git-logs] scummvm master -> f6a0e197b1929bc14d5e1a5b8ce61db5b14833f9

[sev-]

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

Summary:
f6a0e197b1 ZVISION: Add workaround for ZGI bug #10605


Commit: f6a0e197b1929bc14d5e1a5b8ce61db5b14833f9
    https://github.com/scummvm/scummvm/commit/f6a0e197b1929bc14d5e1a5b8ce61db5b14833f9
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2018-07-29T09:48:47+02:00

Commit Message:
ZVISION: Add workaround for ZGI bug #10605

It's possible to get the "Fire! Fire!" timer stuck after setting
the the inquisitor doll on fire. This should work around that.

Changed paths:
    engines/zvision/scripting/scr_file_handling.cpp


diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index cc84542..88d43e0 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -222,6 +222,28 @@ bool ScriptManager::parseCriteria(Common::SeekableReadStream &stream, Common::Li
 			entry.argumentIsAKey = false;
 		}
 
+		// WORKAROUND for a script bug in Zork: Grand Inquisitor. If the
+		// fire timer is killed (e.g. by the inventory screen) with less
+		// than 10 units left, it will get stuck and never time out. We
+		// work around that by changing the condition from "greater than
+		// 10" to "greater than 0 but not 2 (the magic time-out value)".
+		//
+		// I have a sneaking suspicion that there may be other timer
+		// glitches like this, but this one makes the game unplayable
+		// and is easy to trigger.
+		if (_engine->getGameId() == GID_GRANDINQUISITOR && key == 17162) {
+			Puzzle::CriteriaEntry entry0;
+			entry0.key = 17161; // pe_fire
+			entry0.criteriaOperator = Puzzle::GREATER_THAN;
+			entry0.argumentIsAKey = false;
+			entry0.argument = 0;
+
+			criteriaList.back().push_back(entry0);
+
+			entry.criteriaOperator = Puzzle::NOT_EQUAL_TO;
+			entry.argument = 2;
+		}
+
 		criteriaList.back().push_back(entry);
 
 		line = stream.readLine();