diff options
| author | Strangerke | 2016-09-10 14:31:49 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-10 14:31:49 +0200 |
| commit | d2b0829476e6e045a1d322b94bde64b0fcb87234 (patch) | |
| tree | 7b82955f942230da9a5fa6c1d233d8e519fe1ee8 /engines/dm/eventman.cpp | |
| parent | d588e15dad218c4b797a16cf694a954e4d5b35b7 (diff) | |
| download | scummvm-rg350-d2b0829476e6e045a1d322b94bde64b0fcb87234.tar.gz scummvm-rg350-d2b0829476e6e045a1d322b94bde64b0fcb87234.tar.bz2 scummvm-rg350-d2b0829476e6e045a1d322b94bde64b0fcb87234.zip | |
DM: Change constants into enums in champion.h, renaming
Diffstat (limited to 'engines/dm/eventman.cpp')
| -rw-r--r-- | engines/dm/eventman.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp index 97fd534dde..e7095ce4a7 100644 --- a/engines/dm/eventman.cpp +++ b/engines/dm/eventman.cpp @@ -1009,9 +1009,9 @@ void EventManager::commandMoveParty(CommandType cmdType) { movementArrowIdx += (_vm->_dungeonMan->_partyDir + 2); int16 L1124_i_FirstDamagedChampionIndex = _vm->_championMan->getTargetChampionIndex(partyMapX, partyMapY, normalizeModulo4(movementArrowIdx)); int16 L1125_i_SecondDamagedChampionIndex = _vm->_championMan->getTargetChampionIndex(partyMapX, partyMapY, returnNextVal(movementArrowIdx)); - int16 damage = _vm->_championMan->addPendingDamageAndWounds_getDamage(L1124_i_FirstDamagedChampionIndex, 1, kDMWoundTorso | kDMWoundLegs, k2_attackType_SELF); + int16 damage = _vm->_championMan->addPendingDamageAndWounds_getDamage(L1124_i_FirstDamagedChampionIndex, 1, kDMWoundTorso | kDMWoundLegs, kDMAttackTypeSelf); if (L1124_i_FirstDamagedChampionIndex != L1125_i_SecondDamagedChampionIndex) - damage |= _vm->_championMan->addPendingDamageAndWounds_getDamage(L1125_i_SecondDamagedChampionIndex, 1, kDMWoundTorso | kDMWoundLegs, k2_attackType_SELF); + damage |= _vm->_championMan->addPendingDamageAndWounds_getDamage(L1125_i_SecondDamagedChampionIndex, 1, kDMWoundTorso | kDMWoundLegs, kDMAttackTypeSelf); if (damage) _vm->_sound->requestPlay(k18_soundPARTY_DAMAGED, partyMapX, partyMapY, k0_soundModePlayImmediately); |