From bfb4ec311de9d23d6ed50d729b2eaa9ae40a83e0 Mon Sep 17 00:00:00 2001 From: megamage Date: Sun, 23 Aug 2009 11:33:00 -0500 Subject: *Fix a typo in proc flag. By thenecromancer --HG-- branch : trunk --- src/game/SpellMgr.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 91e11ca90a4..6cf3ee14830 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1372,11 +1372,10 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr if (!(procExtra & PROC_EX_INTERNAL_DOT)) return false; } - else if (EventProcFlag & PROC_FLAG_TAKEN_POSITIVE_MAGIC_SPELL - && !(procExtra & PROC_EX_INTERNAL_HOT)) - return false; else if (procExtra & PROC_EX_INTERNAL_HOT) procExtra |= PROC_EX_INTERNAL_REQ_FAMILY; + else if (EventProcFlag & PROC_FLAG_SUCCESSFUL_POSITIVE_MAGIC_SPELL) + return false; } if (procFlags & PROC_FLAG_ON_TAKE_PERIODIC) @@ -1386,11 +1385,10 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr if (!(procExtra & PROC_EX_INTERNAL_DOT)) return false; } - else if (EventProcFlag & PROC_FLAG_TAKEN_POSITIVE_MAGIC_SPELL - && !(procExtra & PROC_EX_INTERNAL_HOT)) - return false; else if (procExtra & PROC_EX_INTERNAL_HOT) procExtra |= PROC_EX_INTERNAL_REQ_FAMILY; + else if (EventProcFlag & PROC_FLAG_TAKEN_POSITIVE_MAGIC_SPELL) + return false; } // Trap casts are active by default if (procFlags & PROC_FLAG_ON_TRAP_ACTIVATION) -- cgit v1.2.3