Index: ScriptMgr.cpp
===================================================================
--- ScriptMgr.cpp	(revision 59)
+++ ScriptMgr.cpp	(working copy)
@@ -971,7 +971,7 @@
         }
             
         //If we are within range melee the target
-        if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+        if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
         {
             if( m_creature->isAttackReady() )
             {
Index: ScriptMgr.h
===================================================================
--- ScriptMgr.h	(revision 59)
+++ ScriptMgr.h	(working copy)
@@ -136,7 +136,7 @@
         if (!who)
             return false;
 
-        return m_creature->IsWithinDistInMap(who, VISIBLE_RANGE) && who->isVisibleFor(m_creature,true);
+        return m_creature->IsWithinDistInMap(who, VISIBLE_RANGE) && who->isVisibleForOrDetect(m_creature,true);
     }
 
     //Called at World update tick
Index: scripts/boss/sc_boss_emeriss.cpp
===================================================================
--- scripts/boss/sc_boss_emeriss.cpp	(revision 59)
+++ scripts/boss/sc_boss_emeriss.cpp	(working copy)
@@ -160,7 +160,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/boss/sc_boss_taerar.cpp
===================================================================
--- scripts/boss/sc_boss_taerar.cpp	(revision 59)
+++ scripts/boss/sc_boss_taerar.cpp	(working copy)
@@ -223,7 +223,7 @@
             }
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/boss/sc_boss_ysondre.cpp
===================================================================
--- scripts/boss/sc_boss_ysondre.cpp	(revision 59)
+++ scripts/boss/sc_boss_ysondre.cpp	(working copy)
@@ -199,7 +199,7 @@
             }
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/creature/sc_defias.cpp
===================================================================
--- scripts/creature/sc_defias.cpp	(revision 59)
+++ scripts/creature/sc_defias.cpp	(working copy)
@@ -67,7 +67,7 @@
 
                 //Begin melee attack if we are within range
                 DoStartMeleeAttack(who);
-                if (!m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+                if (!m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
                 {
                     DoCast(m_creature, GENERIC_CREATURE_ROOTSELF);
                     IsSelfRooted = true;
@@ -147,7 +147,7 @@
             }
             
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
@@ -190,9 +190,9 @@
                     if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 30 && rand() % 3 == 0)
                         info = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING);
 
-                    //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DIST)
+                    //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE)
                     if (info) Healing = true;
-                        else info = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, ATTACK_DIST, 0, SELECT_EFFECT_DONTCARE);
+                        else info = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, ATTACK_DISTANCE, 0, SELECT_EFFECT_DONTCARE);
                
                     //Found a spell, check if we arn't on cooldown
                     if (info && !GlobalCooldown)
Index: scripts/creature/sc_generic_creature.cpp
===================================================================
--- scripts/creature/sc_generic_creature.cpp	(revision 59)
+++ scripts/creature/sc_generic_creature.cpp	(working copy)
@@ -53,7 +53,7 @@
         {
             //Begin melee attack if we are within range
             DoStartMeleeAttack(who);
-            if (!m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+            if (!m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
             {
                 DoCast(m_creature, GENERIC_CREATURE_ROOTSELF);
                 IsSelfRooted = true;
@@ -78,7 +78,7 @@
 
                 //Begin melee attack if we are within range
                 DoStartMeleeAttack(who);
-                if (!m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+                if (!m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
                 {
                     DoCast(m_creature, GENERIC_CREATURE_ROOTSELF);
                     IsSelfRooted = true;
@@ -132,7 +132,7 @@
             }
             
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
@@ -175,9 +175,9 @@
                     if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 30 && rand() % 3 == 0)
                         info = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING);
 
-                    //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DIST)
+                    //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE)
                     if (info) Healing = true;
-                        else info = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, ATTACK_DIST, 0, SELECT_EFFECT_DONTCARE);
+                        else info = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, ATTACK_DISTANCE, 0, SELECT_EFFECT_DONTCARE);
                
                     //Found a spell, check if we arn't on cooldown
                     if (info && !GlobalCooldown)
Index: scripts/creature/sc_kobold.cpp
===================================================================
--- scripts/creature/sc_kobold.cpp	(revision 59)
+++ scripts/creature/sc_kobold.cpp	(working copy)
@@ -50,7 +50,7 @@
         if (who->isTargetableForAttack() && who!= m_creature)
         {
             //Begin melee attack if we are within range
-            if (m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+            if (m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
                 DoStartMeleeAttack(who);
             else DoStartRangedAttack(who);
             
@@ -75,7 +75,7 @@
                     who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
 
                 //Begin melee attack if we are within range
-                if (m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+                if (m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
                     DoStartMeleeAttack(who);
                 else DoStartRangedAttack(who);
 
@@ -131,7 +131,7 @@
             }
             
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
@@ -174,9 +174,9 @@
                     if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 30 && rand() % 3 == 0)
                         info = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING);
 
-                    //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DIST)
+                    //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE)
                     if (info) Healing = true;
-                        else info = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, ATTACK_DIST, 0, SELECT_EFFECT_DONTCARE);
+                        else info = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, ATTACK_DISTANCE, 0, SELECT_EFFECT_DONTCARE);
                
                     //Found a spell, check if we arn't on cooldown
                     if (info && !GlobalCooldown)
Index: scripts/creature/sc_shade_of_taerar.cpp
===================================================================
--- scripts/creature/sc_shade_of_taerar.cpp	(revision 59)
+++ scripts/creature/sc_shade_of_taerar.cpp	(working copy)
@@ -103,7 +103,7 @@
             }else PosionBreath_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/custom/sc_custom_example.cpp
===================================================================
--- scripts/custom/sc_custom_example.cpp	(revision 59)
+++ scripts/custom/sc_custom_example.cpp	(working copy)
@@ -123,7 +123,7 @@
                     who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
 
                 //Begin melee attack if we are within range
-                if (m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+                if (m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
                     DoStartMeleeAttack(who);
                 else DoStartRangedAttack(who);
 
@@ -256,7 +256,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->getVictim() && m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->getVictim() && m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Check if our attack is ready (swing timer)
                 if( m_creature->isAttackReady() )
Index: scripts/guard/sc_guard_ai.h
===================================================================
--- scripts/guard/sc_guard_ai.h	(revision 59)
+++ scripts/guard/sc_guard_ai.h	(working copy)
@@ -53,7 +53,7 @@
         if (who->isTargetableForAttack() && who!= m_creature)
         {
             //Begin melee attack if we are within range
-            if (m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+            if (m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
                 DoStartMeleeAttack(who);
             else DoStartRangedAttack(who);
 
@@ -79,7 +79,7 @@
                     m_creature->SendZoneUnderAttackMessage((Player*)who);
 
                 //Begin melee attack if we are within range
-                if (m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+                if (m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
                     DoStartMeleeAttack(who);
                 else DoStartRangedAttack(who);
 
@@ -131,7 +131,7 @@
             }
             
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
@@ -174,9 +174,9 @@
                     if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 30 && rand() % 3 == 0)
                         info = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING);
 
-                    //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DIST)
+                    //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE)
                     if (info) Healing = true;
-                        else info = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, ATTACK_DIST, 0, SELECT_EFFECT_DONTCARE);
+                        else info = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, ATTACK_DISTANCE, 0, SELECT_EFFECT_DONTCARE);
                
                     //Found a spell, check if we arn't on cooldown
                     if (info && !GlobalCooldown)
Index: scripts/zone/azshara/sc_boss_azuregos.cpp
===================================================================
--- scripts/zone/azshara/sc_boss_azuregos.cpp	(revision 59)
+++ scripts/zone/azshara/sc_boss_azuregos.cpp	(working copy)
@@ -147,7 +147,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_ambassador_flamelash.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_ambassador_flamelash.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_ambassador_flamelash.cpp	(working copy)
@@ -133,7 +133,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_angerrel.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_angerrel.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_angerrel.cpp	(working copy)
@@ -124,7 +124,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_anubshiah.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_anubshiah.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_anubshiah.cpp	(working copy)
@@ -157,7 +157,7 @@
             }else EnvelopingWeb_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_baelgar.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_baelgar.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_baelgar.cpp	(working copy)
@@ -104,7 +104,7 @@
             }else SpawnOfBaelgar_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_doomrel.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_doomrel.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_doomrel.cpp	(working copy)
@@ -173,7 +173,7 @@
             }
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_doperel.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_doperel.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_doperel.cpp	(working copy)
@@ -119,7 +119,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_emperor_dagran_thaurissan.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_emperor_dagran_thaurissan.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_emperor_dagran_thaurissan.cpp	(working copy)
@@ -135,7 +135,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_fineous_darkvire.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_fineous_darkvire.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_fineous_darkvire.cpp	(working copy)
@@ -114,7 +114,7 @@
             }else Kick_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_general_angerforge.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_general_angerforge.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_general_angerforge.cpp	(working copy)
@@ -196,7 +196,7 @@
             }
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_gloomrel.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_gloomrel.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_gloomrel.cpp	(working copy)
@@ -119,7 +119,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_golem_lord_argelmach.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_golem_lord_argelmach.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_golem_lord_argelmach.cpp	(working copy)
@@ -119,7 +119,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_gorosh_the_dervish.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_gorosh_the_dervish.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_gorosh_the_dervish.cpp	(working copy)
@@ -107,7 +107,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_grizzle.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_grizzle.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_grizzle.cpp	(working copy)
@@ -113,7 +113,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_haterel.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_haterel.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_haterel.cpp	(working copy)
@@ -143,7 +143,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_high_interrogator_gerstahn.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_high_interrogator_gerstahn.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_high_interrogator_gerstahn.cpp	(working copy)
@@ -142,7 +142,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_lord_incendius.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_lord_incendius.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_lord_incendius.cpp	(working copy)
@@ -120,7 +120,7 @@
             }else Curse_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_lord_roccor.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_lord_roccor.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_lord_roccor.cpp	(working copy)
@@ -124,7 +124,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_magmus.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_magmus.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_magmus.cpp	(working copy)
@@ -112,7 +112,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_pyromancer_loregrain.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_pyromancer_loregrain.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_pyromancer_loregrain.cpp	(working copy)
@@ -139,7 +139,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_seethrel.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_seethrel.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_seethrel.cpp	(working copy)
@@ -153,7 +153,7 @@
             }else FrostWard_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_verek.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_verek.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_verek.cpp	(working copy)
@@ -107,7 +107,7 @@
             }else FrostNova_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_vilerel.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_vilerel.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_vilerel.cpp	(working copy)
@@ -139,7 +139,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_boss_warder_stilgiss.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_boss_warder_stilgiss.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_boss_warder_stilgiss.cpp	(working copy)
@@ -107,7 +107,7 @@
             }else FrostNova_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_overmaster_pyron.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_overmaster_pyron.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_overmaster_pyron.cpp	(working copy)
@@ -108,7 +108,7 @@
             }else FireBlast_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_depths/sc_phalanx.cpp
===================================================================
--- scripts/zone/blackrock_depths/sc_phalanx.cpp	(revision 59)
+++ scripts/zone/blackrock_depths/sc_phalanx.cpp	(working copy)
@@ -126,7 +126,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_spire/sc_boss_drakkisath.cpp
===================================================================
--- scripts/zone/blackrock_spire/sc_boss_drakkisath.cpp	(revision 59)
+++ scripts/zone/blackrock_spire/sc_boss_drakkisath.cpp	(working copy)
@@ -135,7 +135,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_spire/sc_boss_halycon.cpp
===================================================================
--- scripts/zone/blackrock_spire/sc_boss_halycon.cpp	(revision 59)
+++ scripts/zone/blackrock_spire/sc_boss_halycon.cpp	(working copy)
@@ -122,7 +122,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_spire/sc_boss_highlord_omokk.cpp
===================================================================
--- scripts/zone/blackrock_spire/sc_boss_highlord_omokk.cpp	(revision 59)
+++ scripts/zone/blackrock_spire/sc_boss_highlord_omokk.cpp	(working copy)
@@ -182,7 +182,7 @@
             }else Dazed_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_spire/sc_boss_mother_smolderweb.cpp
===================================================================
--- scripts/zone/blackrock_spire/sc_boss_mother_smolderweb.cpp	(revision 59)
+++ scripts/zone/blackrock_spire/sc_boss_mother_smolderweb.cpp	(working copy)
@@ -133,7 +133,7 @@
             }else WebExplosion_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_spire/sc_boss_overlord_wyrmthalak.cpp
===================================================================
--- scripts/zone/blackrock_spire/sc_boss_overlord_wyrmthalak.cpp	(revision 59)
+++ scripts/zone/blackrock_spire/sc_boss_overlord_wyrmthalak.cpp	(working copy)
@@ -158,7 +158,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_spire/sc_boss_shadow_hunter_voshgajin.cpp
===================================================================
--- scripts/zone/blackrock_spire/sc_boss_shadow_hunter_voshgajin.cpp	(revision 59)
+++ scripts/zone/blackrock_spire/sc_boss_shadow_hunter_voshgajin.cpp	(working copy)
@@ -120,7 +120,7 @@
             }else Cleave_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_spire/sc_boss_the_beast.cpp
===================================================================
--- scripts/zone/blackrock_spire/sc_boss_the_beast.cpp	(revision 59)
+++ scripts/zone/blackrock_spire/sc_boss_the_beast.cpp	(working copy)
@@ -121,7 +121,7 @@
             }else TerrifyingRoar_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_spire/sc_boss_warmaster_voone.cpp
===================================================================
--- scripts/zone/blackrock_spire/sc_boss_warmaster_voone.cpp	(revision 59)
+++ scripts/zone/blackrock_spire/sc_boss_warmaster_voone.cpp	(working copy)
@@ -170,7 +170,7 @@
             }else Dazed_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackrock_spire/sc_quartermaster_zigris.cpp
===================================================================
--- scripts/zone/blackrock_spire/sc_quartermaster_zigris.cpp	(revision 59)
+++ scripts/zone/blackrock_spire/sc_quartermaster_zigris.cpp	(working copy)
@@ -121,7 +121,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackwing_lair/sc_broodlord_lashlayer.cpp
===================================================================
--- scripts/zone/blackwing_lair/sc_broodlord_lashlayer.cpp	(revision 59)
+++ scripts/zone/blackwing_lair/sc_broodlord_lashlayer.cpp	(working copy)
@@ -158,7 +158,7 @@
             }else KnockBack_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackwing_lair/sc_chromaggus.cpp
===================================================================
--- scripts/zone/blackwing_lair/sc_chromaggus.cpp	(revision 59)
+++ scripts/zone/blackwing_lair/sc_chromaggus.cpp	(working copy)
@@ -394,7 +394,7 @@
             }
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackwing_lair/sc_ebonroc.cpp
===================================================================
--- scripts/zone/blackwing_lair/sc_ebonroc.cpp	(revision 59)
+++ scripts/zone/blackwing_lair/sc_ebonroc.cpp	(working copy)
@@ -117,7 +117,7 @@
             }else ShadowOfEbonroc_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackwing_lair/sc_firemaw.cpp
===================================================================
--- scripts/zone/blackwing_lair/sc_firemaw.cpp	(revision 59)
+++ scripts/zone/blackwing_lair/sc_firemaw.cpp	(working copy)
@@ -116,7 +116,7 @@
             
             
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackwing_lair/sc_flamegor.cpp
===================================================================
--- scripts/zone/blackwing_lair/sc_flamegor.cpp	(revision 59)
+++ scripts/zone/blackwing_lair/sc_flamegor.cpp	(working copy)
@@ -116,7 +116,7 @@
             
             
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackwing_lair/sc_nefarian.cpp
===================================================================
--- scripts/zone/blackwing_lair/sc_nefarian.cpp	(revision 59)
+++ scripts/zone/blackwing_lair/sc_nefarian.cpp	(working copy)
@@ -314,7 +314,7 @@
             }
             
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackwing_lair/sc_razorgore.cpp
===================================================================
--- scripts/zone/blackwing_lair/sc_razorgore.cpp	(revision 59)
+++ scripts/zone/blackwing_lair/sc_razorgore.cpp	(working copy)
@@ -139,7 +139,7 @@
             }else Conflagration_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blackwing_lair/sc_vaelastrasz.cpp
===================================================================
--- scripts/zone/blackwing_lair/sc_vaelastrasz.cpp	(revision 59)
+++ scripts/zone/blackwing_lair/sc_vaelastrasz.cpp	(working copy)
@@ -279,7 +279,7 @@
             }else TailSwipe_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blasted_lands/sc_boss_kruul.cpp
===================================================================
--- scripts/zone/blasted_lands/sc_boss_kruul.cpp	(revision 59)
+++ scripts/zone/blasted_lands/sc_boss_kruul.cpp	(working copy)
@@ -214,7 +214,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/blasted_lands/sc_teremus_the_devourer.cpp
===================================================================
--- scripts/zone/blasted_lands/sc_teremus_the_devourer.cpp	(revision 59)
+++ scripts/zone/blasted_lands/sc_teremus_the_devourer.cpp	(working copy)
@@ -117,7 +117,7 @@
             }else ResistAll_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/gruuls_lair/sc_boss_gruul.cpp
===================================================================
--- scripts/zone/gruuls_lair/sc_boss_gruul.cpp	(revision 59)
+++ scripts/zone/gruuls_lair/sc_boss_gruul.cpp	(working copy)
@@ -131,7 +131,7 @@
             }else Reverberation_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/hellfire_peninsula/sc_boss_doomlord_kazzak.cpp
===================================================================
--- scripts/zone/hellfire_peninsula/sc_boss_doomlord_kazzak.cpp	(revision 59)
+++ scripts/zone/hellfire_peninsula/sc_boss_doomlord_kazzak.cpp	(working copy)
@@ -171,7 +171,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/karazhan/sc_curator.cpp
===================================================================
--- scripts/zone/karazhan/sc_curator.cpp	(revision 59)
+++ scripts/zone/karazhan/sc_curator.cpp	(working copy)
@@ -237,7 +237,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)                        
Index: scripts/zone/karazhan/sc_maiden_of_virtue.cpp
===================================================================
--- scripts/zone/karazhan/sc_maiden_of_virtue.cpp	(revision 59)
+++ scripts/zone/karazhan/sc_maiden_of_virtue.cpp	(working copy)
@@ -210,7 +210,7 @@
             }else Divinewrath_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/maraudon/sc_boss_landslide.cpp
===================================================================
--- scripts/zone/maraudon/sc_boss_landslide.cpp	(revision 59)
+++ scripts/zone/maraudon/sc_boss_landslide.cpp	(working copy)
@@ -149,7 +149,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/maraudon/sc_boss_lord_vyletongue.cpp
===================================================================
--- scripts/zone/maraudon/sc_boss_lord_vyletongue.cpp	(revision 59)
+++ scripts/zone/maraudon/sc_boss_lord_vyletongue.cpp	(working copy)
@@ -103,7 +103,7 @@
             }else SmokeBomb_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/maraudon/sc_boss_noxxion.cpp
===================================================================
--- scripts/zone/maraudon/sc_boss_noxxion.cpp	(revision 59)
+++ scripts/zone/maraudon/sc_boss_noxxion.cpp	(working copy)
@@ -173,7 +173,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/maraudon/sc_boss_princess_theradras.cpp
===================================================================
--- scripts/zone/maraudon/sc_boss_princess_theradras.cpp	(revision 59)
+++ scripts/zone/maraudon/sc_boss_princess_theradras.cpp	(working copy)
@@ -135,7 +135,7 @@
             }else RepulsiveGaze_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/maraudon/sc_boss_rotgrip.cpp
===================================================================
--- scripts/zone/maraudon/sc_boss_rotgrip.cpp	(revision 59)
+++ scripts/zone/maraudon/sc_boss_rotgrip.cpp	(working copy)
@@ -91,7 +91,7 @@
             }else Puncture_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/maraudon/sc_boss_tinkerer_gizlock.cpp
===================================================================
--- scripts/zone/maraudon/sc_boss_tinkerer_gizlock.cpp	(revision 59)
+++ scripts/zone/maraudon/sc_boss_tinkerer_gizlock.cpp	(working copy)
@@ -106,7 +106,7 @@
             }else Bomb_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/maraudon/sc_celebras_the_cursed.cpp
===================================================================
--- scripts/zone/maraudon/sc_celebras_the_cursed.cpp	(revision 59)
+++ scripts/zone/maraudon/sc_celebras_the_cursed.cpp	(working copy)
@@ -160,7 +160,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/maraudon/sc_meshlok_the_harvester.cpp
===================================================================
--- scripts/zone/maraudon/sc_meshlok_the_harvester.cpp	(revision 59)
+++ scripts/zone/maraudon/sc_meshlok_the_harvester.cpp	(working copy)
@@ -103,7 +103,7 @@
             }else Strike_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/maraudon/sc_razorlash.cpp
===================================================================
--- scripts/zone/maraudon/sc_razorlash.cpp	(revision 59)
+++ scripts/zone/maraudon/sc_razorlash.cpp	(working copy)
@@ -122,7 +122,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/molten_core/sc_boss_baron_geddon.cpp
===================================================================
--- scripts/zone/molten_core/sc_boss_baron_geddon.cpp	(revision 59)
+++ scripts/zone/molten_core/sc_boss_baron_geddon.cpp	(working copy)
@@ -133,7 +133,7 @@
             }else LivingBomb_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/molten_core/sc_boss_garr.cpp
===================================================================
--- scripts/zone/molten_core/sc_boss_garr.cpp	(revision 59)
+++ scripts/zone/molten_core/sc_boss_garr.cpp	(working copy)
@@ -105,7 +105,7 @@
             }else MagmaShackles_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/molten_core/sc_boss_gehennas.cpp
===================================================================
--- scripts/zone/molten_core/sc_boss_gehennas.cpp	(revision 59)
+++ scripts/zone/molten_core/sc_boss_gehennas.cpp	(working copy)
@@ -120,7 +120,7 @@
             }else GehennasCurse_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/molten_core/sc_boss_golemagg.cpp
===================================================================
--- scripts/zone/molten_core/sc_boss_golemagg.cpp	(revision 59)
+++ scripts/zone/molten_core/sc_boss_golemagg.cpp	(working copy)
@@ -96,7 +96,7 @@
             }else Pyroblast_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/molten_core/sc_boss_lucifron.cpp
===================================================================
--- scripts/zone/molten_core/sc_boss_lucifron.cpp	(revision 59)
+++ scripts/zone/molten_core/sc_boss_lucifron.cpp	(working copy)
@@ -116,7 +116,7 @@
             }else ShadowShock_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/molten_core/sc_boss_magmadar.cpp
===================================================================
--- scripts/zone/molten_core/sc_boss_magmadar.cpp	(revision 59)
+++ scripts/zone/molten_core/sc_boss_magmadar.cpp	(working copy)
@@ -140,7 +140,7 @@
             }else Lavabomb_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/molten_core/sc_boss_majordomo_executus.cpp
===================================================================
--- scripts/zone/molten_core/sc_boss_majordomo_executus.cpp	(revision 59)
+++ scripts/zone/molten_core/sc_boss_majordomo_executus.cpp	(working copy)
@@ -168,7 +168,7 @@
             }else Blastwave_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/molten_core/sc_boss_ragnaros.cpp
===================================================================
--- scripts/zone/molten_core/sc_boss_ragnaros.cpp	(revision 59)
+++ scripts/zone/molten_core/sc_boss_ragnaros.cpp	(working copy)
@@ -212,7 +212,7 @@
             }else Submerge_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/molten_core/sc_boss_shazzrah.cpp
===================================================================
--- scripts/zone/molten_core/sc_boss_shazzrah.cpp	(revision 59)
+++ scripts/zone/molten_core/sc_boss_shazzrah.cpp	(working copy)
@@ -134,7 +134,7 @@
             }else Countspell_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/molten_core/sc_boss_sulfuron_harbinger.cpp
===================================================================
--- scripts/zone/molten_core/sc_boss_sulfuron_harbinger.cpp	(revision 59)
+++ scripts/zone/molten_core/sc_boss_sulfuron_harbinger.cpp	(working copy)
@@ -133,7 +133,7 @@
             }else Flamespear_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/molten_core/sc_mob_firelord.cpp
===================================================================
--- scripts/zone/molten_core/sc_mob_firelord.cpp	(revision 59)
+++ scripts/zone/molten_core/sc_mob_firelord.cpp	(working copy)
@@ -109,7 +109,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/naxxramas/sc_anubrekhan.cpp
===================================================================
--- scripts/zone/naxxramas/sc_anubrekhan.cpp	(revision 59)
+++ scripts/zone/naxxramas/sc_anubrekhan.cpp	(working copy)
@@ -118,7 +118,7 @@
         if (!who)
             return false;
 
-        return m_creature->IsWithinDistInMap(who, 100.0f) && who->isVisibleFor(m_creature,true);
+        return m_creature->IsWithinDistInMap(who, 100.0f) && who->isVisibleForOrDetect(m_creature,true);
     }
 
     void MoveInLineOfSight(Unit *who)
@@ -241,7 +241,7 @@
             }else Summon_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/naxxramas/sc_kelthuzad.cpp
===================================================================
--- scripts/zone/naxxramas/sc_kelthuzad.cpp	(revision 59)
+++ scripts/zone/naxxramas/sc_kelthuzad.cpp	(working copy)
@@ -539,7 +539,7 @@
                 else GuardiansOfIcecrown_Timer -= diff;
             
             //Melee if we can
-            if(m_creature->IsWithinDistInMap(m_creature->getVictim(),ATTACK_DIST))
+            if(m_creature->IsWithinDistInMap(m_creature->getVictim(),ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if(m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/naxxramas/sc_maexxna.cpp
===================================================================
--- scripts/zone/naxxramas/sc_maexxna.cpp	(revision 59)
+++ scripts/zone/naxxramas/sc_maexxna.cpp	(working copy)
@@ -157,7 +157,7 @@
             }
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/naxxramas/sc_patchwerk.cpp
===================================================================
--- scripts/zone/naxxramas/sc_patchwerk.cpp	(revision 59)
+++ scripts/zone/naxxramas/sc_patchwerk.cpp	(working copy)
@@ -186,7 +186,7 @@
             }
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/naxxramas/sc_razuvious.cpp
===================================================================
--- scripts/zone/naxxramas/sc_razuvious.cpp	(revision 59)
+++ scripts/zone/naxxramas/sc_razuvious.cpp	(working copy)
@@ -221,7 +221,7 @@
             }else CommandSound_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/onyxias_lair/sc_boss_onyxia.cpp
===================================================================
--- scripts/zone/onyxias_lair/sc_boss_onyxia.cpp	(revision 59)
+++ scripts/zone/onyxias_lair/sc_boss_onyxia.cpp	(working copy)
@@ -276,7 +276,7 @@
             }
 
             //If we are within range melee the target and not in phase 2
-            if( phase!=2 && m_creature->getVictim() && m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( phase!=2 && m_creature->getVictim() && m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 if( m_creature->isAttackReady() )
                 {
Index: scripts/zone/razorfen_downs/sc_boss_amnennar_the_coldbringer.cpp
===================================================================
--- scripts/zone/razorfen_downs/sc_boss_amnennar_the_coldbringer.cpp	(revision 59)
+++ scripts/zone/razorfen_downs/sc_boss_amnennar_the_coldbringer.cpp	(working copy)
@@ -161,7 +161,7 @@
             }
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/ruins_of_ahnqiraj/sc_ayamiss.cpp
===================================================================
--- scripts/zone/ruins_of_ahnqiraj/sc_ayamiss.cpp	(revision 59)
+++ scripts/zone/ruins_of_ahnqiraj/sc_ayamiss.cpp	(working copy)
@@ -45,7 +45,7 @@
         if (who->isTargetableForAttack() && who!= m_creature)
         {
             //Begin melee attack if we are within range
-            if (m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+            if (m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
 				DoStartMeleeAttack(who);
             else DoStartRangedAttack(who);
 			
@@ -121,7 +121,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/ruins_of_ahnqiraj/sc_kurinnaxx.cpp
===================================================================
--- scripts/zone/ruins_of_ahnqiraj/sc_kurinnaxx.cpp	(revision 59)
+++ scripts/zone/ruins_of_ahnqiraj/sc_kurinnaxx.cpp	(working copy)
@@ -53,7 +53,7 @@
         if (who->isTargetableForAttack() && who!= m_creature)
         {
             //Begin melee attack if we are within range
-            if (m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+            if (m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
 				DoStartMeleeAttack(who);
             else DoStartRangedAttack(who);
 			
@@ -127,7 +127,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/ruins_of_ahnqiraj/sc_moam.cpp
===================================================================
--- scripts/zone/ruins_of_ahnqiraj/sc_moam.cpp	(revision 59)
+++ scripts/zone/ruins_of_ahnqiraj/sc_moam.cpp	(working copy)
@@ -58,7 +58,7 @@
         if (who->isTargetableForAttack() && who!= m_creature)
         {
             //Begin melee attack if we are within range
-            if (m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+            if (m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
 				DoStartMeleeAttack(who);
             else DoStartRangedAttack(who);
 			
@@ -149,7 +149,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scarlet_monastery/sc_boss_arcanist_doan.cpp
===================================================================
--- scripts/zone/scarlet_monastery/sc_boss_arcanist_doan.cpp	(revision 59)
+++ scripts/zone/scarlet_monastery/sc_boss_arcanist_doan.cpp	(working copy)
@@ -78,7 +78,7 @@
         if (who->isTargetableForAttack() && who!= m_creature)
         {
             //Begin melee attack if we are within range
-            if (m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+            if (m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
                 DoStartMeleeAttack(who);
             else DoStartRangedAttack(who);
 
@@ -215,7 +215,7 @@
             }else ManaShield4_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scarlet_monastery/sc_boss_azshir_the_sleepless.cpp
===================================================================
--- scripts/zone/scarlet_monastery/sc_boss_azshir_the_sleepless.cpp	(revision 59)
+++ scripts/zone/scarlet_monastery/sc_boss_azshir_the_sleepless.cpp	(working copy)
@@ -122,7 +122,7 @@
             }else Terrify_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scarlet_monastery/sc_boss_bloodmage_thalnos.cpp
===================================================================
--- scripts/zone/scarlet_monastery/sc_boss_bloodmage_thalnos.cpp	(revision 59)
+++ scripts/zone/scarlet_monastery/sc_boss_bloodmage_thalnos.cpp	(working copy)
@@ -68,7 +68,7 @@
         if (who->isTargetableForAttack() && who!= m_creature)
         {
             //Begin melee attack if we are within range
-            if (m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+            if (m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
                 DoStartMeleeAttack(who);
             else DoStartRangedAttack(who);
             
@@ -176,7 +176,7 @@
             }else FireNova_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scarlet_monastery/sc_boss_herod.cpp
===================================================================
--- scripts/zone/scarlet_monastery/sc_boss_herod.cpp	(revision 59)
+++ scripts/zone/scarlet_monastery/sc_boss_herod.cpp	(working copy)
@@ -251,7 +251,7 @@
             }else ConeOfCold5_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scarlet_monastery/sc_boss_high_inquisitor_fairbanks.cpp
===================================================================
--- scripts/zone/scarlet_monastery/sc_boss_high_inquisitor_fairbanks.cpp	(revision 59)
+++ scripts/zone/scarlet_monastery/sc_boss_high_inquisitor_fairbanks.cpp	(working copy)
@@ -171,7 +171,7 @@
             }else MindBlast5_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scarlet_monastery/sc_boss_high_inquisitor_whitemane.cpp
===================================================================
--- scripts/zone/scarlet_monastery/sc_boss_high_inquisitor_whitemane.cpp	(revision 59)
+++ scripts/zone/scarlet_monastery/sc_boss_high_inquisitor_whitemane.cpp	(working copy)
@@ -225,7 +225,7 @@
             }else MindBlast6_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scarlet_monastery/sc_boss_houndmaster_loksey.cpp
===================================================================
--- scripts/zone/scarlet_monastery/sc_boss_houndmaster_loksey.cpp	(revision 59)
+++ scripts/zone/scarlet_monastery/sc_boss_houndmaster_loksey.cpp	(working copy)
@@ -109,7 +109,7 @@
             }else Enrage_Timer -= diff;
             
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scarlet_monastery/sc_boss_interrogator_vishas.cpp
===================================================================
--- scripts/zone/scarlet_monastery/sc_boss_interrogator_vishas.cpp	(revision 59)
+++ scripts/zone/scarlet_monastery/sc_boss_interrogator_vishas.cpp	(working copy)
@@ -145,7 +145,7 @@
             }else PowerWordShield_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scarlet_monastery/sc_boss_scarlet_commander_mograine.cpp
===================================================================
--- scripts/zone/scarlet_monastery/sc_boss_scarlet_commander_mograine.cpp	(revision 59)
+++ scripts/zone/scarlet_monastery/sc_boss_scarlet_commander_mograine.cpp	(working copy)
@@ -202,7 +202,7 @@
             }else BlessingOfProtection3_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scarlet_monastery/sc_boss_scorn.cpp
===================================================================
--- scripts/zone/scarlet_monastery/sc_boss_scorn.cpp	(revision 59)
+++ scripts/zone/scarlet_monastery/sc_boss_scorn.cpp	(working copy)
@@ -129,7 +129,7 @@
             }else FrostNova_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scarlet_monastery/sc_scarlet_torturer.cpp
===================================================================
--- scripts/zone/scarlet_monastery/sc_scarlet_torturer.cpp	(revision 59)
+++ scripts/zone/scarlet_monastery/sc_scarlet_torturer.cpp	(working copy)
@@ -127,7 +127,7 @@
             }else Immolate_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scholomance/sc_boss_doctor_theolen_krastinov.cpp
===================================================================
--- scripts/zone/scholomance/sc_boss_doctor_theolen_krastinov.cpp	(revision 59)
+++ scripts/zone/scholomance/sc_boss_doctor_theolen_krastinov.cpp	(working copy)
@@ -123,7 +123,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scholomance/sc_boss_illucia_barov.cpp
===================================================================
--- scripts/zone/scholomance/sc_boss_illucia_barov.cpp	(revision 59)
+++ scripts/zone/scholomance/sc_boss_illucia_barov.cpp	(working copy)
@@ -135,7 +135,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scholomance/sc_boss_instructor_malicia.cpp
===================================================================
--- scripts/zone/scholomance/sc_boss_instructor_malicia.cpp	(revision 59)
+++ scripts/zone/scholomance/sc_boss_instructor_malicia.cpp	(working copy)
@@ -175,7 +175,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scholomance/sc_boss_jandice_barov.cpp
===================================================================
--- scripts/zone/scholomance/sc_boss_jandice_barov.cpp	(revision 59)
+++ scripts/zone/scholomance/sc_boss_jandice_barov.cpp	(working copy)
@@ -189,7 +189,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scholomance/sc_boss_kormok.cpp
===================================================================
--- scripts/zone/scholomance/sc_boss_kormok.cpp	(revision 59)
+++ scripts/zone/scholomance/sc_boss_kormok.cpp	(working copy)
@@ -186,7 +186,7 @@
             }
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scholomance/sc_boss_lord_alexei_barov.cpp
===================================================================
--- scripts/zone/scholomance/sc_boss_lord_alexei_barov.cpp	(revision 59)
+++ scripts/zone/scholomance/sc_boss_lord_alexei_barov.cpp	(working copy)
@@ -122,7 +122,7 @@
             }else VeilofShadow_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scholomance/sc_boss_lorekeeper_polkelt.cpp
===================================================================
--- scripts/zone/scholomance/sc_boss_lorekeeper_polkelt.cpp	(revision 59)
+++ scripts/zone/scholomance/sc_boss_lorekeeper_polkelt.cpp	(working copy)
@@ -126,7 +126,7 @@
             }else NoxiousCatalyst_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scholomance/sc_boss_ras_frostwhisper.cpp
===================================================================
--- scripts/zone/scholomance/sc_boss_ras_frostwhisper.cpp	(revision 59)
+++ scripts/zone/scholomance/sc_boss_ras_frostwhisper.cpp	(working copy)
@@ -162,7 +162,7 @@
             }else FrostVolley_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scholomance/sc_boss_the_ravenian.cpp
===================================================================
--- scripts/zone/scholomance/sc_boss_the_ravenian.cpp	(revision 59)
+++ scripts/zone/scholomance/sc_boss_the_ravenian.cpp	(working copy)
@@ -140,7 +140,7 @@
             }else KnockAway_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/scholomance/sc_boss_vectus.cpp
===================================================================
--- scripts/zone/scholomance/sc_boss_vectus.cpp	(revision 59)
+++ scripts/zone/scholomance/sc_boss_vectus.cpp	(working copy)
@@ -122,7 +122,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_archivist_galford.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_archivist_galford.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_archivist_galford.cpp	(working copy)
@@ -123,7 +123,7 @@
             }else Pyroblast_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_baron_rivendare.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_baron_rivendare.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_baron_rivendare.cpp	(working copy)
@@ -248,7 +248,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_baroness_anastari.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_baroness_anastari.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_baroness_anastari.cpp	(working copy)
@@ -141,7 +141,7 @@
             }else Possess_Timer -= diff;
             */
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_black_guard_swordsmith.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_black_guard_swordsmith.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_black_guard_swordsmith.cpp	(working copy)
@@ -113,7 +113,7 @@
             }else BansheeCurse_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_cannon_master_willey.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_cannon_master_willey.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_cannon_master_willey.cpp	(working copy)
@@ -236,7 +236,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_crimson_hammersmith.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_crimson_hammersmith.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_crimson_hammersmith.cpp	(working copy)
@@ -126,7 +126,7 @@
             }else HammerOfJustice_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_dathrohan_balnazzar.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_dathrohan_balnazzar.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_dathrohan_balnazzar.cpp	(working copy)
@@ -295,7 +295,7 @@
             }
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_fras_siabi.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_fras_siabi.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_fras_siabi.cpp	(working copy)
@@ -140,7 +140,7 @@
             }else DemoralizingShout_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_hearthsinger_forresten.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_hearthsinger_forresten.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_hearthsinger_forresten.cpp	(working copy)
@@ -109,7 +109,7 @@
             }else Shoot_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_magistrate_barthilas.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_magistrate_barthilas.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_magistrate_barthilas.cpp	(working copy)
@@ -131,7 +131,7 @@
             }else Dazed_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_maleki_the_pallid.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_maleki_the_pallid.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_maleki_the_pallid.cpp	(working copy)
@@ -136,7 +136,7 @@
             }else DrainLife_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_malor_the_zealous.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_malor_the_zealous.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_malor_the_zealous.cpp	(working copy)
@@ -106,7 +106,7 @@
             }
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_nerubenkan.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_nerubenkan.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_nerubenkan.cpp	(working copy)
@@ -153,7 +153,7 @@
             }else RaiseUndeadScarab_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_postmaster_malown.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_postmaster_malown.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_postmaster_malown.cpp	(working copy)
@@ -168,7 +168,7 @@
             }else CallOfTheGrave_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_ramstein_the_gorger.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_ramstein_the_gorger.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_ramstein_the_gorger.cpp	(working copy)
@@ -109,7 +109,7 @@
             }else Knockout_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_skul.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_skul.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_skul.cpp	(working copy)
@@ -137,7 +137,7 @@
             }else ArcaneBolt_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_stonespine.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_stonespine.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_stonespine.cpp	(working copy)
@@ -122,7 +122,7 @@
             }else DeafeningScreech_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_the_unforgiven.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_the_unforgiven.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_the_unforgiven.cpp	(working copy)
@@ -109,7 +109,7 @@
             }else Chilled_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_boss_timmy_the_cruel.cpp
===================================================================
--- scripts/zone/stratholme/sc_boss_timmy_the_cruel.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_boss_timmy_the_cruel.cpp	(working copy)
@@ -102,7 +102,7 @@
             }else RavenousClaw_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_bile_slime.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_bile_slime.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_bile_slime.cpp	(working copy)
@@ -123,7 +123,7 @@
             }else SlowingPoison_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_bile_spewer.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_bile_spewer.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_bile_spewer.cpp	(working copy)
@@ -142,7 +142,7 @@
             }else SpawnBileSlime_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_black_guard_sentry.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_black_guard_sentry.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_black_guard_sentry.cpp	(working copy)
@@ -125,7 +125,7 @@
             }else Dazed_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_broken_cadaver.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_broken_cadaver.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_broken_cadaver.cpp	(working copy)
@@ -105,7 +105,7 @@
             }else ExplodingCadaver_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_crimson_battle_mage.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_crimson_battle_mage.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_crimson_battle_mage.cpp	(working copy)
@@ -119,7 +119,7 @@
             }else Immolate_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_crimson_conjuror.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_crimson_conjuror.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_crimson_conjuror.cpp	(working copy)
@@ -132,7 +132,7 @@
             }else SummonWaterElemental_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_crimson_defender.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_crimson_defender.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_crimson_defender.cpp	(working copy)
@@ -126,7 +126,7 @@
             }
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_crimson_gallant.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_crimson_gallant.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_crimson_gallant.cpp	(working copy)
@@ -119,7 +119,7 @@
             }else CrusaderStrike_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_crimson_guardsman.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_crimson_guardsman.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_crimson_guardsman.cpp	(working copy)
@@ -131,7 +131,7 @@
             }else KnockAway_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_crimson_initiate.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_crimson_initiate.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_crimson_initiate.cpp	(working copy)
@@ -125,7 +125,7 @@
             }else Renew_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_crimson_inquisitor.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_crimson_inquisitor.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_crimson_inquisitor.cpp	(working copy)
@@ -123,7 +123,7 @@
             }else ManaBurn_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_crimson_monk.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_crimson_monk.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_crimson_monk.cpp	(working copy)
@@ -101,7 +101,7 @@
             }else SnapKick_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_crimson_priest.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_crimson_priest.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_crimson_priest.cpp	(working copy)
@@ -125,7 +125,7 @@
             } else HolyLight_Timer-=diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_crimson_rifleman.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_crimson_rifleman.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_crimson_rifleman.cpp	(working copy)
@@ -111,7 +111,7 @@
 
 
                 //If we are within range melee the target
-                if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+                if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
                 {
                     //Make sure our attack is ready and we arn't currently casting
                     if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_crimson_sorcerer.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_crimson_sorcerer.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_crimson_sorcerer.cpp	(working copy)
@@ -140,7 +140,7 @@
             }else FireBlast_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_crypt_beast.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_crypt_beast.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_crypt_beast.cpp	(working copy)
@@ -133,7 +133,7 @@
             }else DeafeningScreech_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_crypt_crawler.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_crypt_crawler.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_crypt_crawler.cpp	(working copy)
@@ -121,7 +121,7 @@
             }else DeafeningScreech_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_eye_of_naxxramas.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_eye_of_naxxramas.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_eye_of_naxxramas.cpp	(working copy)
@@ -154,7 +154,7 @@
             }else SummonRockwingGargoyles_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_fleshflayer_ghoul.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_fleshflayer_ghoul.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_fleshflayer_ghoul.cpp	(working copy)
@@ -137,7 +137,7 @@
             }else GhoulPlague_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_freed_soul.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_freed_soul.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_freed_soul.cpp	(working copy)
@@ -82,7 +82,7 @@
         {
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_ghostly_citizen.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_ghostly_citizen.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_ghostly_citizen.cpp	(working copy)
@@ -137,7 +137,7 @@
             }else Dazed_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_ghoul_ravener.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_ghoul_ravener.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_ghoul_ravener.cpp	(working copy)
@@ -153,7 +153,7 @@
             }else GhoulPlague_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_mangled_cadaver.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_mangled_cadaver.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_mangled_cadaver.cpp	(working copy)
@@ -126,7 +126,7 @@
             }else CadaverWorms_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_mindless_skeleton.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_mindless_skeleton.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_mindless_skeleton.cpp	(working copy)
@@ -95,7 +95,7 @@
             }else Dazed_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_patchwork_horror.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_patchwork_horror.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_patchwork_horror.cpp	(working copy)
@@ -139,7 +139,7 @@
             }else WeakenedSoul_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_plague_ghoul.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_plague_ghoul.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_plague_ghoul.cpp	(working copy)
@@ -157,7 +157,7 @@
             }else GhoulPlague_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_ravaged_cadaver.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_ravaged_cadaver.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_ravaged_cadaver.cpp	(working copy)
@@ -174,7 +174,7 @@
             }else SummonBrokenCadaver_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_restless_soul.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_restless_soul.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_restless_soul.cpp	(working copy)
@@ -108,7 +108,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_rockwing_gargoyle.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_rockwing_gargoyle.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_rockwing_gargoyle.cpp	(working copy)
@@ -140,7 +140,7 @@
             }else DeafeningScreech_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_rockwing_screecher.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_rockwing_screecher.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_rockwing_screecher.cpp	(working copy)
@@ -170,7 +170,7 @@
             }else DemoralizingShout_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_shrieking_banshee.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_shrieking_banshee.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_shrieking_banshee.cpp	(working copy)
@@ -121,7 +121,7 @@
             }else DeafeningScreech_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_skeletal_berserker.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_skeletal_berserker.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_skeletal_berserker.cpp	(working copy)
@@ -170,7 +170,7 @@
             }else Hamstring_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_skeletal_guardian.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_skeletal_guardian.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_skeletal_guardian.cpp	(working copy)
@@ -149,7 +149,7 @@
             }else ArcaneExplosion_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_spectral_citizen.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_spectral_citizen.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_spectral_citizen.cpp	(working copy)
@@ -152,7 +152,7 @@
             }else DemoralizingShout_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_spiteful_phantom.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_spiteful_phantom.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_spiteful_phantom.cpp	(working copy)
@@ -140,7 +140,7 @@
             }else HauntingPhantoms_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_thuzadin_acolyte.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_thuzadin_acolyte.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_thuzadin_acolyte.cpp	(working copy)
@@ -95,7 +95,7 @@
             }else Dazed_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_thuzadin_necromancer.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_thuzadin_necromancer.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_thuzadin_necromancer.cpp	(working copy)
@@ -116,7 +116,7 @@
             }else BoneArmor_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_thuzadin_shadowcaster.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_thuzadin_shadowcaster.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_thuzadin_shadowcaster.cpp	(working copy)
@@ -122,7 +122,7 @@
             }else PiercingShadow_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_undead_scarab.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_undead_scarab.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_undead_scarab.cpp	(working copy)
@@ -105,7 +105,7 @@
             }else Dazed_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_vengeful_phantom.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_vengeful_phantom.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_vengeful_phantom.cpp	(working copy)
@@ -125,7 +125,7 @@
             }else FrostShock_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_venom_belcher.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_venom_belcher.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_venom_belcher.cpp	(working copy)
@@ -123,7 +123,7 @@
             }else SlowingPoison_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_wailing_banshee.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_wailing_banshee.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_wailing_banshee.cpp	(working copy)
@@ -152,7 +152,7 @@
             }else SoulTap_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/stratholme/sc_mob_wrath_phantom.cpp
===================================================================
--- scripts/zone/stratholme/sc_mob_wrath_phantom.cpp	(revision 59)
+++ scripts/zone/stratholme/sc_mob_wrath_phantom.cpp	(working copy)
@@ -125,7 +125,7 @@
             }else HauntingPhantoms_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/temple_of_ahnqiraj/sc_huhuran.cpp
===================================================================
--- scripts/zone/temple_of_ahnqiraj/sc_huhuran.cpp	(revision 59)
+++ scripts/zone/temple_of_ahnqiraj/sc_huhuran.cpp	(working copy)
@@ -125,7 +125,7 @@
             }else Poison_Timer -= diff;
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)
Index: scripts/zone/temple_of_ahnqiraj/sc_sartura.cpp
===================================================================
--- scripts/zone/temple_of_ahnqiraj/sc_sartura.cpp	(revision 59)
+++ scripts/zone/temple_of_ahnqiraj/sc_sartura.cpp	(working copy)
@@ -38,7 +38,7 @@
         if (who->isTargetableForAttack() && who!= m_creature)
         {
             //Begin melee attack if we are within range
-            if (m_creature->IsWithinDistInMap(who, ATTACK_DIST))
+            if (m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE))
                 DoStartMeleeAttack(who);
             else DoStartRangedAttack(who);
             
@@ -99,7 +99,7 @@
 
 
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DIST))
+            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 //Make sure our attack is ready and we arn't currently casting
                 if( m_creature->isAttackReady() && !m_creature->m_currentSpell)