From 931ad00a2d208335fc45885bfc7f53a53e6d9dce Mon Sep 17 00:00:00 2001
From: richiesams
Date: Mon, 5 Aug 2013 19:18:04 -0500
Subject: ZVISION: Add StateFlag handling to Puzzle checking

---
 engines/zvision/script_manager.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 38ca1075d1..fe6548cd80 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -77,6 +77,15 @@ void ScriptManager::checkPuzzleCriteria() {
 	while (!_puzzlesToCheck.empty()) {
 		Puzzle *puzzle = _puzzlesToCheck.pop();
 
+		// Check if the puzzle is already finished
+		// If it doesn't have the flag ONCE_PER_INST it can be done more than once
+		// Also check that the puzzle isn't disabled
+		if (getStateValue(puzzle->key) == 1 &&
+		    (puzzle->flags & Puzzle::StateFlags::ONCE_PER_INST) == Puzzle::StateFlags::ONCE_PER_INST &&
+		    (puzzle->flags & Puzzle::StateFlags::DISABLED) == 0) {
+			continue;
+		}
+
 		debug("Checking puzzle: %u", puzzle->key);
 
 		// Check each Criteria
-- 
cgit v1.2.3