From e5e53498cede475ae0d80623e89c4a3cbec39b62 Mon Sep 17 00:00:00 2001 From: QAston Date: Fri, 8 Oct 2010 19:17:49 +0200 Subject: Core/Spells: - Add more descriptive enumerator of procflags - now clearly pointing out that proc flags are dependant to the spell dmg class of the spells causing procs. - Define and implement PROC_FLAG_DONE_MAINHAND_ATTACK. --HG-- branch : trunk --- src/server/game/Spells/SpellMgr.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/server/game/Spells/SpellMgr.cpp') diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 256fdd5378f..370e960088c 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1392,33 +1392,33 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr */ - if (procFlags & PROC_FLAG_ON_DO_PERIODIC) + if (procFlags & PROC_FLAG_DONE_PERIODIC) { - if (EventProcFlag & PROC_FLAG_SUCCESSFUL_NEGATIVE_MAGIC_SPELL) + if (EventProcFlag & PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_NEG) { if (!(procExtra & PROC_EX_INTERNAL_DOT)) return false; } else if (procExtra & PROC_EX_INTERNAL_HOT) procExtra |= PROC_EX_INTERNAL_REQ_FAMILY; - else if (EventProcFlag & PROC_FLAG_SUCCESSFUL_POSITIVE_MAGIC_SPELL) + else if (EventProcFlag & PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_POS) return false; } - if (procFlags & PROC_FLAG_ON_TAKE_PERIODIC) + if (procFlags & PROC_FLAG_TAKEN_PERIODIC) { - if (EventProcFlag & PROC_FLAG_TAKEN_NEGATIVE_MAGIC_SPELL) + if (EventProcFlag & PROC_FLAG_TAKEN_SPELL_MAGIC_DMG_CLASS_POS) { if (!(procExtra & PROC_EX_INTERNAL_DOT)) return false; } else if (procExtra & PROC_EX_INTERNAL_HOT) procExtra |= PROC_EX_INTERNAL_REQ_FAMILY; - else if (EventProcFlag & PROC_FLAG_TAKEN_POSITIVE_MAGIC_SPELL) + else if (EventProcFlag & PROC_FLAG_TAKEN_SPELL_NONE_DMG_CLASS_POS) return false; } // Trap casts are active by default - if (procFlags & PROC_FLAG_ON_TRAP_ACTIVATION) + if (procFlags & PROC_FLAG_DONE_TRAP_ACTIVATION) active = true; // Always trigger for this -- cgit v1.2.3