libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 20:51:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fixed warnings

Browse Source 
svn-id: r15161
This commit is contained in:
Paweł Kołodziejski 2004-09-18 11:34:55 +00:00
parent 27946f1e86
commit 5c442f53aa
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scumm/actor.cpp
View File

@ -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() {

2
scumm/insane/insane.cpp
View File

@ -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]);

4
sky/control.cpp
View File

@ -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);