Index: trunk/src/bindings/scripts/scripts/npc/npc_escortAI.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/npc/npc_escortAI.cpp (revision 90) +++ trunk/src/bindings/scripts/scripts/npc/npc_escortAI.cpp (revision 158) @@ -213,5 +213,5 @@ { //If we are within range melee the target - if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) { if( m_creature->isAttackReady() ) Index: trunk/src/bindings/scripts/scripts/guard/guard_ai.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/guard/guard_ai.cpp (revision 90) +++ trunk/src/bindings/scripts/scripts/guard/guard_ai.cpp (revision 158) @@ -87,5 +87,5 @@ { //If we are within range melee the target - if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) { bool Healing = false; Index: trunk/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp (revision 90) +++ trunk/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp (revision 158) @@ -43,5 +43,5 @@ void Aggro(Unit *who) { - if (!m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE)) + if (!m_creature->IsWithinCombatDist(who, ATTACK_DISTANCE)) { IsSelfRooted = true; @@ -82,5 +82,5 @@ //If we are within range melee the target - if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) { //Make sure our attack is ready and we arn't currently casting Index: trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp (revision 109) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp (revision 158) @@ -170,5 +170,5 @@ { Unit* temp = NULL; - if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE) ) + if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE) ) temp = m_creature->getVictim(); else temp = SelectUnit(SELECT_TARGET_RANDOM,0); Index: trunk/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp (revision 141) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp (revision 158) @@ -1836,5 +1836,5 @@ void DoMeleeAttackIfReady() { - if( m_creature->isAttackReady() && m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if( m_creature->isAttackReady() && m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) { if(!m_creature->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND, 0)) Index: trunk/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp (revision 90) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp (revision 158) @@ -246,5 +246,5 @@ { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); - if(pUnit && m_creature->IsWithinDistInMap(pUnit, ATTACK_DISTANCE)) + if(pUnit && m_creature->IsWithinCombatDist(pUnit, ATTACK_DISTANCE)) { if(pUnit->GetHealth() > health) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp (revision 117) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp (revision 158) @@ -398,5 +398,5 @@ if(m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false)) { - if(m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if(m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) { m_creature->AttackerStateUpdate(m_creature->getVictim()); Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp (revision 90) +++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp (revision 158) @@ -149,5 +149,5 @@ //If we are within range melee the target - if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) { //Make sure our attack is ready and we arn't currently casting Index: trunk/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp (revision 90) +++ trunk/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp (revision 158) @@ -121,5 +121,5 @@ return; - if (m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if (m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) { //when hp <= 20% gain enrage Index: trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp (revision 117) +++ trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp (revision 158) @@ -327,5 +327,5 @@ { //If we are within range melee the target - if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) { HandleTouchedSpells(m_creature->getVictim(), SPELL_DARK_TOUCHED); @@ -740,5 +740,5 @@ { //If we are within range melee the target - if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) { DoCast(m_creature->getVictim(),SPELL_DARK_STRIKE); Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp (revision 115) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp (revision 158) @@ -101,5 +101,5 @@ if (Resonance_Timer < diff) { - if (!m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if (!m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) DoCast(m_creature->getVictim(), SPELL_RESONANCE); Resonance_Timer = 5000; Index: trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp (revision 98) +++ trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp (revision 158) @@ -244,5 +244,5 @@ target = SelectUnit(SELECT_TARGET_TOPAGGRO,1); - if (target && m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if (target && m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) DoCast(target,SPELL_HURTFUL_STRIKE); else Index: trunk/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp (revision 105) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp (revision 158) @@ -613,5 +613,5 @@ void DoMeleeAttacksIfReady() { - if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE) && !m_creature->IsNonMeleeSpellCasted(false)) + if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE) && !m_creature->IsNonMeleeSpellCasted(false)) { //Check for base attack Index: trunk/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp (revision 90) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp (revision 158) @@ -275,5 +275,5 @@ //If we are within range melee the target - if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) { //Make sure our attack is ready and we arn't currently casting Index: trunk/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp (revision 153) +++ trunk/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp (revision 158) @@ -269,5 +269,5 @@ if( !m_creature->IsNonMeleeSpellCasted(false)) { - if(m_creature->isAttackReady() && m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if(m_creature->isAttackReady() && m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) { if(Phase == 1 && !Overpower_Timer) @@ -614,5 +614,5 @@ { //if the vortex reach the target, it change his target to another player - if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0)); } Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp (revision 90) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp (revision 158) @@ -172,5 +172,5 @@ } - if( phase!=2 && m_creature->getVictim() && m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + if( phase!=2 && m_creature->getVictim() && m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) { if( m_creature->isAttackReady() )