From 4704f6134b624b1da203c26c315f328e00ffe961 Mon Sep 17 00:00:00 2001 From: megamage Date: Thu, 5 Mar 2009 20:15:46 -0600 Subject: [PATCH] *Fix build. --HG-- branch : trunk --- src/game/SpellAuras.cpp | 2 +- src/game/SpellEffects.cpp | 2 +- src/game/Unit.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index a50b1e5049..0a462bc273 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -1970,7 +1970,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real) return; } // Haunt - if(caster && m_spellProto->SpellFamilyName=SPELLFAMILY_WARLOCK && m_spellProto->SpellFamilyFlags[1] & 0x40000) + if(caster && m_spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellProto->SpellFamilyFlags[1] & 0x40000) { caster->CastCustomSpell(caster, 48210, &m_currentBasePoints, 0, 0, true); return; diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index e19f2fc42e..4ba282a6aa 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -437,7 +437,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) damage += int32(damage*0.25f); } // Haunt - else if (m_spellProto->SpellFamilyFlags[1] & 0x40000) + else if (m_spellInfo->SpellFamilyFlags[1] & 0x40000) { // Save damage for future healing // TODO: Implement spell proc on aura expire diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 3354eab3af..c201c73d1a 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5545,7 +5545,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu if (triggerAmount == 0) return false; basepoints0 = triggerAmount * GetMaxHealth() / 100; - trigger_spell_id = 34299; + triggered_spell_id = 34299; } // Healing Touch (Dreamwalker Raiment set) case 28719: