*Merge.

--HG--
branch : trunk

src/bindings/scripts/include/sc_creature.cpp

@@ -63,20 +63,6 @@ void SummonList::DespawnAll()
     clear();
 }
 
-bool ScriptedAI::IsVisible(Unit* who) const
-{
-    if (!who)
-        return false;
-
-    return (m_creature->GetDistance(who) < VISIBLE_RANGE) && who->isVisibleForOrDetect(m_creature,true);
-}
-
-void ScriptedAI::MoveInLineOfSight(Unit *who)
-{
-    if(!m_creature->getVictim() && m_creature->canStartAttack(who))
-        AttackStart(who);
-}
-
 void ScriptedAI::AttackStart(Unit* who, bool melee)
 {
     if (!who)
@@ -85,7 +71,6 @@ void ScriptedAI::AttackStart(Unit* who, bool melee)
     if (m_creature->Attack(who, melee))
     {
         m_creature->AddThreat(who, 0.0f);
-        m_creature->SetInCombatWith(who);
 
         if (!InCombat)
         {
@@ -108,7 +93,6 @@ void ScriptedAI::AttackStart(Unit* who)
     if (m_creature->Attack(who, true))
     {
         m_creature->AddThreat(who, 0.0f);
-        m_creature->SetInCombatWith(who);
 
         if (!InCombat)
         {
@@ -123,7 +107,7 @@ void ScriptedAI::AttackStart(Unit* who)
 void ScriptedAI::UpdateAI(const uint32 diff)
 {
     //Check if we have a current target
-    if (m_creature->isAlive() && m_creature->SelectHostilTarget() && m_creature->getVictim())
+    if (m_creature->isAlive() && UpdateVictim())
     {
         if (m_creature->isAttackReady() )
         {
@@ -834,7 +818,6 @@ void Scripted_NoMovementAI::AttackStart(Unit* who)
     if (m_creature->Attack(who, true))
     {
         m_creature->AddThreat(who, 0.0f);
-        m_creature->SetInCombatWith(who);
 
         if (!InCombat)
         {