diff options
| author | Eugene Sandulenko | 2016-09-11 23:29:11 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-09-11 23:32:40 +0200 |
| commit | c673c5654bb7ea17dc15691f6dd1a1298be25cbc (patch) | |
| tree | e38112d2fdd3886a093fb02d26d3782410907017 /engines/dm/menus.cpp | |
| parent | efe44f1eb0bfdd653d57be8dcca7369f9adf92af (diff) | |
| download | scummvm-rg350-c673c5654bb7ea17dc15691f6dd1a1298be25cbc.tar.gz scummvm-rg350-c673c5654bb7ea17dc15691f6dd1a1298be25cbc.tar.bz2 scummvm-rg350-c673c5654bb7ea17dc15691f6dd1a1298be25cbc.zip | |
DM: Fix comparison warnings
Diffstat (limited to 'engines/dm/menus.cpp')
| -rw-r--r-- | engines/dm/menus.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp index ccc4b301a8..31f6224236 100644 --- a/engines/dm/menus.cpp +++ b/engines/dm/menus.cpp @@ -1286,11 +1286,11 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) { break; case kDMActionFreezeLife: { int16 freezeTicks; - if (weaponInHand->getType() == k42_JunkTypeMagicalBoxBlue) { + if (weaponInHand->getType() == (int)k42_JunkTypeMagicalBoxBlue) { freezeTicks = 30; _vm->_championMan->getObjectRemovedFromSlot(champIndex, kDMSlotActionHand); weaponInHand->setNextThing(Thing::_none); - } else if (weaponInHand->getType() == k43_JunkTypeMagicalBoxGreen) { + } else if (weaponInHand->getType() == (int)k43_JunkTypeMagicalBoxGreen) { freezeTicks = 125; _vm->_championMan->getObjectRemovedFromSlot(champIndex, kDMSlotActionHand); weaponInHand->setNextThing(Thing::_none); @@ -1308,7 +1308,7 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) { break; case kDMActionThrow: setChampionDirectionToPartyDirection(curChampion); - actionPerformed = _vm->_championMan->isObjectThrown(champIndex, kDMSlotActionHand, (curChampion->_cell == _vm->turnDirRight(_vm->_dungeonMan->_partyDir)) || (curChampion->_cell == (ViewCell)_vm->returnOppositeDir(_vm->_dungeonMan->_partyDir))); + actionPerformed = _vm->_championMan->isObjectThrown(champIndex, kDMSlotActionHand, (curChampion->_cell == (ViewCell)_vm->turnDirRight(_vm->_dungeonMan->_partyDir)) || (curChampion->_cell == (ViewCell)_vm->returnOppositeDir(_vm->_dungeonMan->_partyDir))); if (actionPerformed) _vm->_timeline->_events[curChampion->_enableActionEventIndex]._Bu._slotOrdinal = _vm->indexToOrdinal(kDMSlotActionHand); break; |