diff options
| author | Strangerke | 2016-09-09 01:09:25 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-09 01:09:25 +0200 |
| commit | b365338293ab1bbad4deef5f2979639f360d77db (patch) | |
| tree | c18037f008ed12e580618b601d7848a317432294 /engines/dm/menus.cpp | |
| parent | 7654c89d4f420d4277b06698ec60ce289f2d3892 (diff) | |
| download | scummvm-rg350-b365338293ab1bbad4deef5f2979639f360d77db.tar.gz scummvm-rg350-b365338293ab1bbad4deef5f2979639f360d77db.tar.bz2 scummvm-rg350-b365338293ab1bbad4deef5f2979639f360d77db.zip | |
DM: Rename IconIndice enum
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 2b331c9912..81a341b850 100644 --- a/engines/dm/menus.cpp +++ b/engines/dm/menus.cpp @@ -204,7 +204,7 @@ void MenuMan::drawActionIcon(ChampionIndex championIndex) { Thing thing = champion.getSlot(k1_ChampionSlotActionHand); IconIndice iconIndex; if (thing == Thing::_none) { - iconIndex = k201_IconIndiceActionEmptyHand; + iconIndex = kDMIconIndiceActionEmptyHand; } else if (_vm->_dungeonMan->_objectInfos[_vm->_dungeonMan->getObjectInfoIndex(thing)]._actionSetIndex) { iconIndex = _vm->_objectMan->getIconIndex(thing); } else { @@ -787,7 +787,7 @@ void MenuMan::menusPrintSpellFailureMessage(Champion *champ, uint16 failureType, Potion *MenuMan::getEmptyFlaskInHand(Champion *champ, Thing *potionThing) { for (int16 slotIndex = k2_ChampionSlotHead; --slotIndex >= k0_ChampionSlotReadyHand; ) { Thing curThing = champ->_slots[slotIndex]; - if ((curThing != Thing::_none) && (_vm->_objectMan->getIconIndex(curThing) == k195_IconIndicePotionEmptyFlask)) { + if ((curThing != Thing::_none) && (_vm->_objectMan->getIconIndex(curThing) == kDMIconIndicePotionEmptyFlask)) { *potionThing = curThing; return (Potion *)_vm->_dungeonMan->getThingData(curThing); } @@ -1488,7 +1488,7 @@ bool MenuMan::isMeleeActionPerformed(int16 champIndex, Champion *champ, int16 ac uint16 actionHitProbability = actionHitProbabilityArray[actionIndex]; uint16 actionDamageFactor = actionDamageFactorArray[actionIndex]; - if ((_vm->_objectMan->getIconIndex(champ->_slots[k1_ChampionSlotActionHand]) == k40_IconIndiceWeaponVorpalBlade) || (actionIndex == k24_ChampionActionDisrupt)) { + if ((_vm->_objectMan->getIconIndex(champ->_slots[k1_ChampionSlotActionHand]) == kDMIconIndiceWeaponVorpalBlade) || (actionIndex == k24_ChampionActionDisrupt)) { setFlag(actionHitProbability, k0x8000_hitNonMaterialCreatures); } _actionDamage = _vm->_groupMan->getMeleeActionDamage(champ, champIndex, (Group *)_vm->_dungeonMan->getThingData(_actionTargetGroupThing), _vm->ordinalToIndex(targetCreatureOrdinal), targetMapX, targetMapY, actionHitProbability, actionDamageFactor, skillIndex); |