From 628d6cb4ee92aa15dbdf5029b8675cb09d18f3e9 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 5 Jul 2014 17:15:04 +0000
Subject: ZVISION: Fix puzzle disable condition check

---
 engines/zvision/scripting/script_manager.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index a27ae4dbf0..fc765f0bfb 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -158,8 +158,7 @@ void ScriptManager::updateControls(uint deltaTimeMillis) {
 void ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
 	// Check if the puzzle is already finished
 	// Also check that the puzzle isn't disabled
-	if (getStateValue(puzzle->key) == 1 &&
-	        (getStateFlag(puzzle->key) & Puzzle::DISABLED) == 0) {
+	if (getStateValue(puzzle->key) == 1 || (getStateFlag(puzzle->key) & Puzzle::DISABLED) == Puzzle::DISABLED) {
 		return;
 	}
 
-- 
cgit v1.2.3