aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthenecromancer <none@none>2010-04-21 18:52:30 +0200
committerthenecromancer <none@none>2010-04-21 18:52:30 +0200
commitb54feffadbe61d358d09d924533bf2a015581306 (patch)
treee09f6bb3bf16ce17370b13fca88f1690a7be7d0c
parent7f4e73dbffe3b0d63d9891e20c36f3f8db44ac14 (diff)
Weapon dependant damage for some rogue talents
--HG-- branch : trunk
-rw-r--r--src/game/SpellEffects.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 39aa086b004..cbdb666cd90 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -4493,15 +4493,16 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
}
case SPELLFAMILY_ROGUE:
{
- // Hemorrhage
- if (m_spellInfo->SpellFamilyFlags[0] & 0x2000000)
- {
- if (m_caster->GetTypeId() == TYPEID_PLAYER)
- m_caster->ToPlayer()->AddComboPoints(unitTarget, 1, this);
- }
- // Fan of Knives
- else if (m_spellInfo->SpellFamilyFlags[1] & 0x40000)
+ // Fan of Knives, Hemorrhage, Ghostly Strike
+ if ((m_spellInfo->SpellFamilyFlags[1] & 0x40000)
+ || (m_spellInfo->SpellFamilyFlags[0] & 0x6000000))
{
+ // Hemorrhage
+ if (m_spellInfo->SpellFamilyFlags[0] & 0x2000000)
+ {
+ if (m_caster->GetTypeId() == TYPEID_PLAYER)
+ m_caster->ToPlayer()->AddComboPoints(unitTarget, 1, this);
+ }
// 50% more damage with daggers
if (m_caster->GetTypeId() == TYPEID_PLAYER)
if (Item* item = m_caster->ToPlayer()->GetWeaponForAttack(m_attackType, true))