diff options
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 73a5ee7c142..4bb7956aa5e 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -445,8 +445,7 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa for (uint8 i = 0; i < MAX_COMBAT_RATING; i++) m_baseRatingValue[i] = 0; - m_baseSpellDamage = 0; - m_baseSpellHealing = 0; + m_baseSpellPower = 0; m_baseFeralAP = 0; m_baseManaRegen = 0; @@ -6999,12 +6998,6 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl case ITEM_MOD_FERAL_ATTACK_POWER: ApplyFeralAPBonus(int32(val), apply); break; - case ITEM_MOD_SPELL_HEALING_DONE: - ApplySpellHealingBonus(int32(val), apply); - break; - case ITEM_MOD_SPELL_DAMAGE_DONE: - ApplySpellDamageBonus(int32(val), apply); - break; case ITEM_MOD_MANA_REGENERATION: ApplyManaRegenBonus(int32(val), apply); break; @@ -7012,8 +7005,11 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl ApplyRatingMod(CR_ARMOR_PENETRATION, int32(val), apply); break; case ITEM_MOD_SPELL_POWER: - ApplySpellHealingBonus(int32(val), apply); - ApplySpellDamageBonus(int32(val), apply); + ApplySpellPowerBonus(int32(val), apply); + break; + // depricated item mods + case ITEM_MOD_SPELL_HEALING_DONE: + case ITEM_MOD_SPELL_DAMAGE_DONE: break; } } @@ -12505,14 +12501,6 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool ((Player*)this)->ApplyFeralAPBonus(enchant_amount, apply); sLog.outDebug("+ %u FERAL_ATTACK_POWER", enchant_amount); break; - case ITEM_MOD_SPELL_HEALING_DONE: - ((Player*)this)->ApplySpellHealingBonus(enchant_amount, apply); - sLog.outDebug("+ %u SPELL_HEALING_DONE", enchant_amount); - break; - case ITEM_MOD_SPELL_DAMAGE_DONE: - ((Player*)this)->ApplySpellDamageBonus(enchant_amount, apply); - sLog.outDebug("+ %u SPELL_DAMAGE_DONE", enchant_amount); - break; case ITEM_MOD_MANA_REGENERATION: ((Player*)this)->ApplyManaRegenBonus(enchant_amount, apply); sLog.outDebug("+ %u MANA_REGENERATION", enchant_amount); @@ -12522,10 +12510,11 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool sLog.outDebug("+ %u ARMOR PENETRATION", enchant_amount); break; case ITEM_MOD_SPELL_POWER: - ((Player*)this)->ApplySpellHealingBonus(enchant_amount, apply); - ((Player*)this)->ApplySpellDamageBonus(enchant_amount, apply); + ((Player*)this)->ApplySpellPowerBonus(enchant_amount, apply); sLog.outDebug("+ %u SPELL_POWER", enchant_amount); break; + case ITEM_MOD_SPELL_HEALING_DONE: // deprecated + case ITEM_MOD_SPELL_DAMAGE_DONE: // deprecated default: break; } |