aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/menus.cpp
diff options
context:
space:
mode:
authorStrangerke2016-09-11 23:06:29 +0200
committerStrangerke2016-09-11 23:06:29 +0200
commit040d71bca56730c98632be2dcfef139b2e5ed39c (patch)
treeeaf144e68fcd659075e9f9b58d28a8ba2f4fbf21 /engines/dm/menus.cpp
parent7d9526f8880177c5afd0533cb43d3015de949124 (diff)
downloadscummvm-rg350-040d71bca56730c98632be2dcfef139b2e5ed39c.tar.gz
scummvm-rg350-040d71bca56730c98632be2dcfef139b2e5ed39c.tar.bz2
scummvm-rg350-040d71bca56730c98632be2dcfef139b2e5ed39c.zip
DM: Rename more constants
Diffstat (limited to 'engines/dm/menus.cpp')
-rw-r--r--engines/dm/menus.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp
index 57617c57d7..5e1dd58a4d 100644
--- a/engines/dm/menus.cpp
+++ b/engines/dm/menus.cpp
@@ -1141,22 +1141,22 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) {
int16 actionHandWeaponClass = weaponInfoActionHand->_class;
int16 readyHandWeaponClass = weaponInfoReadyHand->_class;
int16 stepEnergy = actionHandWeaponClass;
- if ((actionHandWeaponClass >= k16_WeaponClassFirstBow) && (actionHandWeaponClass <= k31_WeaponClassLastBow)) {
- if (readyHandWeaponClass != k10_WeaponClassBowAmmunition) {
+ if ((actionHandWeaponClass >= kDMWeaponClassFirstBow) && (actionHandWeaponClass <= kDMWeaponClassLastBow)) {
+ if (readyHandWeaponClass != kDMWeaponClassBowAmmunition) {
_actionDamage = kM2_damageNoAmmunition;
actionExperienceGain = 0;
actionPerformed = false;
break;
}
- stepEnergy -= k16_WeaponClassFirstBow;
- } else if ((actionHandWeaponClass >= k32_WeaponClassFirstSling) && (actionHandWeaponClass <= k47_WeaponClassLastSling)) {
- if (readyHandWeaponClass != k11_WeaponClassSlingAmmunition) {
+ stepEnergy -= kDMWeaponClassFirstBow;
+ } else if ((actionHandWeaponClass >= kDMWeaponClassFirstSling) && (actionHandWeaponClass <= kDMWeaponClassLastSling)) {
+ if (readyHandWeaponClass != kDMWeaponClassSlingAmmunition) {
_actionDamage = kM2_damageNoAmmunition;
actionExperienceGain = 0;
actionPerformed = false;
break;
}
- stepEnergy -= k32_WeaponClassFirstSling;
+ stepEnergy -= kDMWeaponClassFirstSling;
}
setChampionDirectionToPartyDirection(curChampion);