From 4d6fb6c8b2d84996711fa8bc41e71fa6d483b98c Mon Sep 17 00:00:00 2001 From: QAston Date: Mon, 15 Jun 2009 18:27:41 +0200 Subject: *Fix build, sorry for that:/ --HG-- branch : trunk --- src/game/SpellAuras.cpp | 2 +- src/game/SpellMgr.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 6dec2b1b041..2ebf5b0002d 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -5872,7 +5872,7 @@ void AuraEffect::HandleSchoolAbsorb(bool apply, bool Real, bool changeAmount) break; case SPELLFAMILY_PALADIN: // Sacred Shield - if (m_spellInfo->SpellFamilyFlags[1] & 0x80000) + if (m_spellProto->SpellFamilyFlags[1] & 0x80000) { // 0.75 from sp bonus DoneActualBenefit = caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.75f; diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index dce89ec7007..5998933afc1 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1276,11 +1276,11 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr { if (EventProcFlag & PROC_FLAG_SUCCESSFUL_DAMAGING_SPELL_HIT) { - if (!(procEx & PROC_EX_INTERNAL_DOT)) + if (!(procExtra & PROC_EX_INTERNAL_DOT)) return false; } else if (EventProcFlag & PROC_FLAG_SUCCESSFUL_HEALING_SPELL - && !(procEx & PROC_EX_INTERNAL_HOT)) + && !(procExtra & PROC_EX_INTERNAL_HOT)) return false; } @@ -1288,11 +1288,11 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr { if (EventProcFlag & PROC_FLAG_TAKEN_DAMAGING_SPELL_HIT) { - if (!(procEx & PROC_EX_INTERNAL_DOT)) + if (!(procExtra & PROC_EX_INTERNAL_DOT)) return false; } else if (EventProcFlag & PROC_FLAG_TAKEN_HEALING_SPELL - && !(procEx & PROC_EX_INTERNAL_HOT)) + && !(procExtra & PROC_EX_INTERNAL_HOT)) return false; } -- cgit v1.2.3