diff options
| author | Strangerke | 2016-09-10 11:47:36 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-10 11:47:36 +0200 |
| commit | d588e15dad218c4b797a16cf694a954e4d5b35b7 (patch) | |
| tree | fb98fb87557c32572b0563e2b3de22fec02535a4 /engines/dm/group.cpp | |
| parent | 33287b765735e48185d45f7367eb091310c715f4 (diff) | |
| download | scummvm-rg350-d588e15dad218c4b797a16cf694a954e4d5b35b7.tar.gz scummvm-rg350-d588e15dad218c4b797a16cf694a954e4d5b35b7.tar.bz2 scummvm-rg350-d588e15dad218c4b797a16cf694a954e4d5b35b7.zip | |
DM: Rename ChampionSlot enum
Diffstat (limited to 'engines/dm/group.cpp')
| -rw-r--r-- | engines/dm/group.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/dm/group.cpp b/engines/dm/group.cpp index 89efd6b478..4ec74ef424 100644 --- a/engines/dm/group.cpp +++ b/engines/dm/group.cpp @@ -1535,7 +1535,7 @@ void GroupMan::stealFromChampion(Group *group, uint16 championIndex) { uint16 slotIdx = _vm->getRandomNumber(8); while ((percentage > 0) && !_vm->_championMan->isLucky(champion, percentage)) { uint16 stealFromSlotIndex = G0394_auc_StealFromSlotIndices[slotIdx]; - if (stealFromSlotIndex == k13_ChampionSlotBackpackLine_1_1) + if (stealFromSlotIndex == kDMSlotBackpackLine1_1) stealFromSlotIndex += _vm->getRandomNumber(17); /* Select a random slot in the backpack */ Thing slotThing = champion->_slots[stealFromSlotIndex]; @@ -1803,7 +1803,7 @@ int16 GroupMan::getMeleeActionDamage(Champion *champ, int16 champIndex, Group *g int16 doubledMapDifficulty = _vm->_dungeonMan->_currMap->_difficulty << 1; CreatureInfo *creatureInfo = &_vm->_dungeonMan->_creatureInfos[group->_type]; - int16 actionHandObjectIconIndex = _vm->_objectMan->getIconIndex(champ->_slots[k1_ChampionSlotActionHand]); + int16 actionHandObjectIconIndex = _vm->_objectMan->getIconIndex(champ->_slots[kDMSlotActionHand]); bool actionHitsNonMaterialCreatures = getFlag(actionHitProbability, k0x8000_hitNonMaterialCreatures); if (actionHitsNonMaterialCreatures) clearFlag(actionHitProbability, k0x8000_hitNonMaterialCreatures); @@ -1813,7 +1813,7 @@ int16 GroupMan::getMeleeActionDamage(Champion *champ, int16 champIndex, Group *g (!_vm->getRandomNumber(4)) || (_vm->_championMan->isLucky(champ, 75 - actionHitProbability)))) { - L0565_i_Damage = _vm->_championMan->getStrength(champIndex, k1_ChampionSlotActionHand); + L0565_i_Damage = _vm->_championMan->getStrength(champIndex, kDMSlotActionHand); if (!(L0565_i_Damage)) goto T0231009; |