diff options
author | maximius <none@none> | 2009-10-18 17:04:54 -0700 |
---|---|---|
committer | maximius <none@none> | 2009-10-18 17:04:54 -0700 |
commit | 3a48de01e70240ed969686c393d8427c317c2c93 (patch) | |
tree | cdac735e910927154dc2b392d9b431466839ad23 | |
parent | 9cd569b3f58467f8e2ace3fa7425f6ac5017352c (diff) |
*Cleanup 649167cf44ca
--HG--
branch : trunk
-rw-r--r-- | src/game/Unit.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 545cb941ce5..50e44229e99 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -10306,18 +10306,18 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT if (spellProto) { // Mod damage from spell mechanic - uint32 mechanicMask = GetAllSpellMechanicMask(m_spellInfo); + uint32 mechanicMask = GetAllSpellMechanicMask(spellProto); // Shred, Maul - "Effects which increase Bleed damage also increase Shred damage" - if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[0] & 0x00008800) + if (spellProto->SpellFamilyName == SPELLFAMILY_DRUID && spellProto->SpellFamilyFlags[0] & 0x00008800) mechanicMask |= (1<<MECHANIC_BLEED); if (mechanicMask) { - Unit::AuraEffectList const& mDamageDoneMechanic = unitTarget->GetAurasByType(SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT); - for(Unit::AuraEffectList::const_iterator i = mDamageDoneMechanic.begin();i != mDamageDoneMechanic.end(); ++i) - if(mechanicMask & uint32(1<<((*i)->GetMiscValue()))) - totalDamagePercentMod *= ((*i)->GetAmount()+100.0f)/100.0f; + AuraEffectList const& mDamageDoneMechanic = pVictim->GetAurasByType(SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT); + for (AuraEffectList::const_iterator i = mDamageDoneMechanic.begin(); i != mDamageDoneMechanic.end(); ++i) + if (mechanicMask & uint32(1<<((*i)->GetMiscValue()))) + TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f; } } |