diff options
author | n0n4m3 <none@none> | 2010-02-15 19:09:17 +0100 |
---|---|---|
committer | n0n4m3 <none@none> | 2010-02-15 19:09:17 +0100 |
commit | feea2417c3036fc98163ad9bfcfe067bf7a620db (patch) | |
tree | 31cdd1239bdbe93069e92199666ff01f35fadd8a /src/game/SpellEffects.cpp | |
parent | ebc5ce6810a65c49f572215b3d6d5e1253a84e7c (diff) |
Fix talent Shockwave and typo in comment.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
-rw-r--r-- | src/game/SpellEffects.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index aca99cce779..ccf3abe022d 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -427,19 +427,19 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) case SPELLFAMILY_WARRIOR: { // Bloodthirst - if(m_spellInfo->SpellFamilyFlags[1] & 0x400) + if (m_spellInfo->SpellFamilyFlags[1] & 0x400) damage = uint32(damage * (m_caster->GetTotalAttackPowerValue(BASE_ATTACK)) / 100); // Shield Slam - else if(m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209) + else if (m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209) damage += int32(m_caster->GetShieldBlockValue()); // Victory Rush - else if(m_spellInfo->SpellFamilyFlags[1] & 0x100) + else if (m_spellInfo->SpellFamilyFlags[1] & 0x100) { damage = uint32(damage * m_caster->GetTotalAttackPowerValue(BASE_ATTACK) / 100); m_caster->ModifyAuraState(AURA_STATE_WARRIOR_VICTORY_RUSH, false); } - // Shockwave ${$m3/100*$AP} - else if(m_spellInfo->SpellFamilyFlags[1] & 0x00008000) + // Shockwave + else if (m_spellInfo->Id == 46968) { int32 pct = m_caster->CalculateSpellDamage(m_spellInfo, 2, m_spellInfo->EffectBasePoints[2], unitTarget); if (pct > 0) |