[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.289,1.290
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat Sep 18 04:36:01 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3009/scummvm/scumm
Modified Files:
actor.cpp
Log Message:
fixed warnings
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -d -r1.289 -r1.290
--- actor.cpp 18 Sep 2004 01:00:22 -0000 1.289
+++ actor.cpp 18 Sep 2004 11:34:55 -0000 1.290
@@ -1863,7 +1863,7 @@
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 @@
bool Actor::isTalkConditionSet(int slot) {
assert(slot >= 1 && slot <= 0x10);
- return condMask & (1 << (slot - 1));
+ return (condMask & (1 << (slot - 1))) != 0;
}
void ScummEngine::preProcessAuxQueue() {
More information about the Scummvm-git-logs
mailing list