diff options
| author | Strangerke | 2016-09-10 14:53:10 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-10 14:53:10 +0200 |
| commit | 4099814fbe6894931b7b393dc2f6ef5736297338 (patch) | |
| tree | 851231a4ade1c090300b111410dcddc623baaf1a /engines/dm/champion.cpp | |
| parent | d2b0829476e6e045a1d322b94bde64b0fcb87234 (diff) | |
| download | scummvm-rg350-4099814fbe6894931b7b393dc2f6ef5736297338.tar.gz scummvm-rg350-4099814fbe6894931b7b393dc2f6ef5736297338.tar.bz2 scummvm-rg350-4099814fbe6894931b7b393dc2f6ef5736297338.zip | |
DM: Finish the renaming in champion.h
Diffstat (limited to 'engines/dm/champion.cpp')
| -rw-r--r-- | engines/dm/champion.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/dm/champion.cpp b/engines/dm/champion.cpp index ea48f85ea9..6b895063ea 100644 --- a/engines/dm/champion.cpp +++ b/engines/dm/champion.cpp @@ -764,7 +764,7 @@ int16 ChampionMan::addPendingDamageAndWounds_getDamage(int16 champIndex, int16 a for (int16 woundIndex = kDMSlotReadyHand; woundIndex <= kDMSlotFeet; woundIndex++) { if (allowedWounds & (1 << woundIndex)) { woundCount++; - defense += getWoundDefense(champIndex, woundIndex | ((attackType == kDMAttackTypeSharp) ? k0x8000_maskUseSharpDefense : k0x0000_maskDoNotUseSharpDefense)); + defense += getWoundDefense(champIndex, woundIndex | ((attackType == kDMAttackTypeSharp) ? kDMMaskSharpDefense : kDMMaskNoSharpDefense)); } } if (woundCount) @@ -843,9 +843,9 @@ int16 ChampionMan::getWoundDefense(int16 champIndex, uint16 woundIndex) { static const byte woundDefenseFactor[6] = {5, 5, 4, 6, 3, 1}; // @ G0050_auc_Graphic562_WoundDefenseFactor Champion *curChampion = &_champions[champIndex]; - bool useSharpDefense = getFlag(woundIndex, k0x8000_maskUseSharpDefense); + bool useSharpDefense = getFlag(woundIndex, kDMMaskSharpDefense); if (useSharpDefense) - clearFlag(woundIndex, k0x8000_maskUseSharpDefense); + clearFlag(woundIndex, kDMMaskSharpDefense); uint16 armorShieldDefense = 0; for (int16 slotIndex = kDMSlotReadyHand; slotIndex <= kDMSlotActionHand; slotIndex++) { @@ -1164,9 +1164,9 @@ void ChampionMan::deleteScent(uint16 scentIndex) { void ChampionMan::addScentStrength(int16 mapX, int16 mapY, int32 cycleCount) { int16 scentIndex = _party._scentCount; if (scentIndex) { - bool mergeFl = getFlag(cycleCount, k0x8000_mergeCycles); + bool mergeFl = getFlag(cycleCount, kDMMaskMergeCycles); if (mergeFl) - clearFlag(cycleCount, k0x8000_mergeCycles); + clearFlag(cycleCount, kDMMaskMergeCycles); Scent newScent; /* BUG0_00 Useless code */ newScent.setMapX(mapX); /* BUG0_00 Useless code */ |