diff options
| author | Marisa-Chan | 2014-07-05 17:15:04 +0000 |
|---|---|---|
| committer | Marisa-Chan | 2014-07-05 17:15:04 +0000 |
| commit | 628d6cb4ee92aa15dbdf5029b8675cb09d18f3e9 (patch) | |
| tree | f95b12512649fe470a3b1f2379f5dc3494f46a5d | |
| parent | 23c1b508611d5fa4e7dfc47f8f5ec10a7de177e3 (diff) | |
| download | scummvm-rg350-628d6cb4ee92aa15dbdf5029b8675cb09d18f3e9.tar.gz scummvm-rg350-628d6cb4ee92aa15dbdf5029b8675cb09d18f3e9.tar.bz2 scummvm-rg350-628d6cb4ee92aa15dbdf5029b8675cb09d18f3e9.zip | |
ZVISION: Fix puzzle disable condition check
| -rw-r--r-- | engines/zvision/scripting/script_manager.cpp | 3 |
1 files changed, 1 insertions, 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; } |