From cdb4c47a9a91c956f4b697865847a4b97568eb7f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 26 Apr 2018 20:34:01 -0400
Subject: XEEN: Fix condition check in Southern Sphinx

---
 engines/xeen/scripts.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index b40ba3059f..3422756a67 100644
--- 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
-- 
cgit v1.2.3