aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2004-09-18 11:34:55 +0000
committerPaweł Kołodziejski2004-09-18 11:34:55 +0000
commit5c442f53aaa705d6c4502cc9cd8430a5e78f2ffa (patch)
tree13fecd8a5be8fb68716fc83fd87d48bc36258469 /scumm/actor.cpp
parent27946f1e86d0deeea46b167bf49f950a61965875 (diff)
downloadscummvm-rg350-5c442f53aaa705d6c4502cc9cd8430a5e78f2ffa.tar.gz
scummvm-rg350-5c442f53aaa705d6c4502cc9cd8430a5e78f2ffa.tar.bz2
scummvm-rg350-5c442f53aaa705d6c4502cc9cd8430a5e78f2ffa.zip
fixed warnings
svn-id: r15161
Diffstat (limited to 'scumm/actor.cpp')
-rw-r--r--scumm/actor.cpp4
1 files changed, 2 insertions, 2 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() {