XEEN: Fix condition check in Southern Sphinx

scummvm · Apr 27, 2018 · cdb4c47a9a91c956f4b697865847a4b97568eb7f · cdb4c47
1 parent e1c6d44
commit cdb4c47a9a91c956f4b697865847a4b97568eb7f
Unified Split

Showing with 2 additions and 3 deletions.

+2 −3 engines/xeen/scripts.cpp
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
@@ -1571,9 +1571,8 @@ bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
 		break;
 	case 18:
 		// Condition
-		assert(val < 16);
-		if (!ps->_conditions[val] && !(val & 0x10))
-			v = val;
+		assert(val <= NO_CONDITION);
+		v = (ps->_conditions[val] || val == NO_CONDITION) ? val : 0xffffffff;
 		break;
 	case 19: {
 		// Can player cast a given spell