Remove SpellChannelInterruptFlags definitions which were duplicate of SpellAuraInterruptFlags, move IsRemoved check to Aura::UpdateTargetMap

--HG--
branch : trunk

2 files changed, 8 insertions, 12 deletions

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index b6c7b30de23..9ced669238d 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -456,6 +456,9 @@ void Aura::_Remove(AuraRemoveMode removeMode)
 
 void Aura::UpdateTargetMap(Unit * caster, bool apply)
 {
+    if (IsRemoved())
+        return;
+
     m_updateTargetMapInterval = UPDATE_TARGET_MAP_INTERVAL;
 
     // fill up to date target list
@@ -593,13 +596,10 @@ void Aura::UpdateOwner(uint32 diff, WorldObject * owner)
 
     Update(diff, caster);
 
-    if (!IsRemoved())
-    {
-        if (m_updateTargetMapInterval <= diff)
-            UpdateTargetMap(caster);
-        else
-            m_updateTargetMapInterval -= diff;
-    }
+    if (m_updateTargetMapInterval <= diff)
+        UpdateTargetMap(caster);
+    else
+        m_updateTargetMapInterval -= diff;
 
     // update aura effects
     for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
diff --git a/src/game/Unit.h b/src/game/Unit.h
index 07281fd90e8..4ef9adca1e9 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -48,13 +48,9 @@ enum SpellInterruptFlags
     //SPELL_INTERRUPT_UNK             = 0x20                // unk, 564 of 727 spells having this spell start with "Glyph"
 };
 
+// See SpellAuraInterruptFlags for other values definitions
 enum SpellChannelInterruptFlags
 {
-    CHANNEL_FLAG_DAMAGE      = 0x0002,
-    CHANNEL_FLAG_MOVEMENT    = 0x0008,
-    CHANNEL_FLAG_TURNING     = 0x0010,
-    CHANNEL_FLAG_DAMAGE2     = 0x0080,
-    CHANNEL_FLAG_ONLY_IN_WATER = 0x0100,
     CHANNEL_FLAG_DELAY       = 0x4000
 };