*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

1 files changed, 19 insertions, 0 deletions

diff --git a/src/game/GuardAI.cpp b/src/game/GuardAI.cpp
index 5454213ce65..a821939910a 100644
--- a/src/game/GuardAI.cpp
+++ b/src/game/GuardAI.cpp
@@ -17,26 +17,32 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
+
 #include "GuardAI.h"
 #include "Errors.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
 #include "World.h"
 #include "CreatureAIImpl.h"
+
 int GuardAI::Permissible(const Creature *creature)
 {
     if( creature->isGuard())
         return PERMIT_BASE_SPECIAL;
+
     return PERMIT_BASE_NO;
 }
+
 GuardAI::GuardAI(Creature *c) : CreatureAI(c), i_victimGuid(0), i_state(STATE_NORMAL), i_tracker(TIME_INTERVAL_LOOK)
 {
 }
+
 void GuardAI::MoveInLineOfSight(Unit *u)
 {
     // Ignore Z for flying creatures
     if ( !m_creature->canFly() && m_creature->GetDistanceZ(u) > CREATURE_Z_ATTACK_RANGE )
         return;
+
     if( !m_creature->getVictim() && m_creature->canAttack(u) &&
         ( u->IsHostileToPlayers() || m_creature->IsHostileTo(u) /*|| u->getVictim() && m_creature->IsFriendlyTo(u->getVictim())*/ ) &&
         u->isInAccessiblePlaceFor(m_creature))
@@ -50,19 +56,24 @@ void GuardAI::MoveInLineOfSight(Unit *u)
         }
     }
 }
+
 void GuardAI::EnterEvadeMode()
 {
     if( !m_creature->isAlive() )
     {
         DEBUG_LOG("Creature stopped attacking because he's dead [guid=%u]", m_creature->GetGUIDLow());
         m_creature->GetMotionMaster()->MoveIdle();
+
         i_state = STATE_NORMAL;
+
         i_victimGuid = 0;
         m_creature->CombatStop(true);
         m_creature->DeleteThreatList();
         return;
     }
+
     Unit* victim = ObjectAccessor::GetUnit(*m_creature, i_victimGuid );
+
     if( !victim  )
     {
         DEBUG_LOG("Creature stopped attacking because victim is non exist [guid=%u]", m_creature->GetGUIDLow());
@@ -83,21 +94,26 @@ void GuardAI::EnterEvadeMode()
     {
         DEBUG_LOG("Creature stopped attacking because victim outran him [guid=%u]", m_creature->GetGUIDLow());
     }
+
     m_creature->RemoveAllAuras();
     m_creature->DeleteThreatList();
     i_victimGuid = 0;
     m_creature->CombatStop(true);
     i_state = STATE_NORMAL;
+
     // Remove TargetedMovementGenerator from MotionMaster stack list, and add HomeMovementGenerator instead
     if( m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE )
         m_creature->GetMotionMaster()->MoveTargetedHome();
 }
+
 void GuardAI::UpdateAI(const uint32 /*diff*/)
 {
     // update i_victimGuid if m_creature->getVictim() !=0 and changed
     if(!UpdateVictim())
         return;
+
     i_victimGuid = m_creature->getVictim()->GetGUID();
+
     if( m_creature->isAttackReady() )
     {
         if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
@@ -107,14 +123,17 @@ void GuardAI::UpdateAI(const uint32 /*diff*/)
         }
     }
 }
+
 bool GuardAI::IsVisible(Unit *pl) const
 {
     return m_creature->IsWithinDist(pl,sWorld.getConfig(CONFIG_SIGHT_GUARDER))
         && pl->isVisibleForOrDetect(m_creature,true);
 }
+
 void GuardAI::JustDied(Unit *killer)
 {
     if(Player* pkiller = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
         m_creature->SendZoneUnderAttackMessage(pkiller);
 }
 
+