diff options
| author | Paweł Kołodziejski | 2004-09-18 11:34:55 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-09-18 11:34:55 +0000 |
| commit | 5c442f53aaa705d6c4502cc9cd8430a5e78f2ffa (patch) | |
| tree | 13fecd8a5be8fb68716fc83fd87d48bc36258469 | |
| parent | 27946f1e86d0deeea46b167bf49f950a61965875 (diff) | |
| download | scummvm-rg350-5c442f53aaa705d6c4502cc9cd8430a5e78f2ffa.tar.gz scummvm-rg350-5c442f53aaa705d6c4502cc9cd8430a5e78f2ffa.tar.bz2 scummvm-rg350-5c442f53aaa705d6c4502cc9cd8430a5e78f2ffa.zip | |
fixed warnings
svn-id: r15161
| -rw-r--r-- | scumm/actor.cpp | 4 | ||||
| -rw-r--r-- | scumm/insane/insane.cpp | 2 | ||||
| -rw-r--r-- | sky/control.cpp | 4 |
3 files changed, 5 insertions, 5 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]); diff --git a/sky/control.cpp b/sky/control.cpp index 02c6d52d6a..11992a1114 100644 --- a/sky/control.cpp +++ b/sky/control.cpp @@ -727,8 +727,8 @@ uint16 Control::toggleText(void) { _statusBar->setToText(0x7000 + 35); // text only } - ConfMan.set("subtitles", (bool)(flags & SF_ALLOW_TEXT)); - + ConfMan.set("subtitles", (flags & SF_ALLOW_TEXT) != 0); + SkyEngine::_systemVars.systemFlags |= flags; drawTextCross(flags); |