diff options
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/actor.cpp | 4 | ||||
| -rw-r--r-- | scumm/insane/insane.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 8346a1c7c5..07895e9ec8 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1863,7 +1863,7 @@ void Actor::setUserCondition(int slot, int set) { bool Actor::isUserConditionSet(int slot) { assert(slot >= 1 && slot <= 0x20); - return condMask & (1 << (slot + 0xF)); + return (condMask & (1 << (slot + 0xF))) != 0; } void Actor::setTalkCondition(int slot) { @@ -1882,7 +1882,7 @@ void Actor::setTalkCondition(int slot) { bool Actor::isTalkConditionSet(int slot) { assert(slot >= 1 && slot <= 0x10); - return condMask & (1 << (slot - 1)); + return (condMask & (1 << (slot - 1))) != 0; } void ScummEngine::preProcessAuxQueue() { diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp index 782d1f0dd1..6e06b3c0df 100644 --- a/scumm/insane/insane.cpp +++ b/scumm/insane/insane.cpp @@ -677,7 +677,7 @@ void Insane::readState(void) { // PATCH error("Wrong INSANE parameters for EN_VULTM2 (%d %d). Please, report this", _enemy[EN_VULTM2].isEmpty, readArray(7)); - if (_enemy[EN_VULTF2].isEmpty != _actor[0].inventory[INV_CHAINSAW]) + if (_enemy[EN_VULTF2].isEmpty != (_actor[0].inventory[INV_CHAINSAW] != 0)) error("Wrong INSANE parameters for EN_VULTF2 (%d %d). Please, report this", _enemy[EN_VULTF2].isEmpty, _actor[0].inventory[INV_CHAINSAW]); |