aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/zvision/script_manager.cpp9
1 files changed, 9 insertions, 0 deletions
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