[Scummvm-git-logs] scummvm master -> cdb4c47a9a91c956f4b697865847a4b97568eb7f

[dreammaster]

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:
cdb4c47a9a XEEN: Fix condition check in Southern Sphinx


Commit: cdb4c47a9a91c956f4b697865847a4b97568eb7f
    https://github.com/scummvm/scummvm/commit/cdb4c47a9a91c956f4b697865847a4b97568eb7f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-26T20:34:01-04:00

Commit Message:
XEEN: Fix condition check in Southern Sphinx

Changed paths:
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index b40ba30..3422756 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