[Scummvm-cvs-logs] scummvm master -> 1330cb7c99478c67a722ff3bd35567dcd59f8fdf

[bluegr]

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:
1330cb7c99 ZVISION: Remove superfluous check


Commit: 1330cb7c99478c67a722ff3bd35567dcd59f8fdf
    https://github.com/scummvm/scummvm/commit/1330cb7c99478c67a722ff3bd35567dcd59f8fdf
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-01-21T01:42:01+02:00

Commit Message:
ZVISION: Remove superfluous check

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



diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index a449110..d10cd81 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -210,7 +210,7 @@ void ScriptManager::updateControls(uint deltaTimeMillis) {
 bool 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) == Puzzle::DISABLED) {
+	if (getStateValue(puzzle->key) == 1 || (getStateFlag(puzzle->key) & Puzzle::DISABLED)) {
 		return true;
 	}