diff options
| author | Paul Gilbert | 2018-04-26 20:34:01 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-04-26 20:34:01 -0400 |
| commit | cdb4c47a9a91c956f4b697865847a4b97568eb7f (patch) | |
| tree | c104ae8b63c96e104a33e99a6ee49878401bb755 /engines/xeen | |
| parent | e1c6d4485ddc2d101ddab6cbc25bdb44535c6c52 (diff) | |
| download | scummvm-rg350-cdb4c47a9a91c956f4b697865847a4b97568eb7f.tar.gz scummvm-rg350-cdb4c47a9a91c956f4b697865847a4b97568eb7f.tar.bz2 scummvm-rg350-cdb4c47a9a91c956f4b697865847a4b97568eb7f.zip | |
XEEN: Fix condition check in Southern Sphinx
Diffstat (limited to 'engines/xeen')
| -rw-r--r-- | engines/xeen/scripts.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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 |