*Even more excessive cleanup..

--HG--
branch : trunk

2 files changed, 30 insertions, 30 deletions

diff --git a/src/bindings/scripts/base/simple_ai.cpp b/src/bindings/scripts/base/simple_ai.cpp
index 2c537a92794..f942bab1ceb 100644
--- a/src/bindings/scripts/base/simple_ai.cpp
+++ b/src/bindings/scripts/base/simple_ai.cpp
@@ -121,33 +121,33 @@ void SimpleAI::KilledUnit(Unit *victim)
     if (!Kill_Spell)
         return;
 
-    Unit* target = NULL;
+    Unit *pTarget = NULL;
 
     switch (Kill_Target_Type)
     {
     case CAST_SELF:
-        target = m_creature;
+        pTarget = m_creature;
         break;
     case CAST_HOSTILE_TARGET:
-        target = m_creature->getVictim();
+        pTarget = m_creature->getVictim();
         break;
     case CAST_HOSTILE_SECOND_AGGRO:
-        target = SelectUnit(SELECT_TARGET_TOPAGGRO,1);
+        pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1);
         break;
     case CAST_HOSTILE_LAST_AGGRO:
-        target = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0);
+        pTarget = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0);
         break;
     case CAST_HOSTILE_RANDOM:
-        target = SelectUnit(SELECT_TARGET_RANDOM,0);
+        pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
         break;
     case CAST_KILLEDUNIT_VICTIM:
-        target = victim;
+        pTarget = victim;
         break;
     }
 
     //Target is ok, cast a spell on it
-    if (target)
-        DoCast(target, Kill_Spell);
+    if (pTarget)
+        DoCast(pTarget, Kill_Spell);
 }
 
 void SimpleAI::DamageTaken(Unit *killer, uint32 &damage)
@@ -169,33 +169,33 @@ void SimpleAI::DamageTaken(Unit *killer, uint32 &damage)
     if (!Death_Spell)
         return;
 
-    Unit* target = NULL;
+    Unit *pTarget = NULL;
 
     switch (Death_Target_Type)
     {
     case CAST_SELF:
-        target = m_creature;
+        pTarget = m_creature;
         break;
     case CAST_HOSTILE_TARGET:
-        target = m_creature->getVictim();
+        pTarget = m_creature->getVictim();
         break;
     case CAST_HOSTILE_SECOND_AGGRO:
-        target = SelectUnit(SELECT_TARGET_TOPAGGRO,1);
+        pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1);
         break;
     case CAST_HOSTILE_LAST_AGGRO:
-        target = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0);
+        pTarget = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0);
         break;
     case CAST_HOSTILE_RANDOM:
-        target = SelectUnit(SELECT_TARGET_RANDOM,0);
+        pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
         break;
     case CAST_JUSTDIED_KILLER:
-        target = killer;
+        pTarget = killer;
         break;
     }
 
     //Target is ok, cast a spell on it
-    if (target)
-        DoCast(target, Death_Spell);
+    if (pTarget)
+        DoCast(pTarget, Death_Spell);
 }
 
 void SimpleAI::UpdateAI(const uint32 diff)
@@ -220,34 +220,34 @@ void SimpleAI::UpdateAI(const uint32 diff)
             //Check Current spell
             if (!(Spell[i].InterruptPreviousCast && m_creature->IsNonMeleeSpellCasted(false)))
             {
-                Unit* target = NULL;
+                Unit *pTarget = NULL;
 
                 switch (Spell[i].Cast_Target_Type)
                 {
                 case CAST_SELF:
-                    target = m_creature;
+                    pTarget = m_creature;
                     break;
                 case CAST_HOSTILE_TARGET:
-                    target = m_creature->getVictim();
+                    pTarget = m_creature->getVictim();
                     break;
                 case CAST_HOSTILE_SECOND_AGGRO:
-                    target = SelectUnit(SELECT_TARGET_TOPAGGRO,1);
+                    pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1);
                     break;
                 case CAST_HOSTILE_LAST_AGGRO:
-                    target = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0);
+                    pTarget = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0);
                     break;
                 case CAST_HOSTILE_RANDOM:
-                    target = SelectUnit(SELECT_TARGET_RANDOM,0);
+                    pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
                     break;
                 }
 
                 //Target is ok, cast a spell on it and then do our random yell
-                if (target)
+                if (pTarget)
                 {
                     if (m_creature->IsNonMeleeSpellCasted(false))
                         m_creature->InterruptNonMeleeSpells(false);
 
-                    DoCast(target, Spell[i].Spell_Id);
+                    DoCast(pTarget, Spell[i].Spell_Id);
 
                     //Yell and sound use the same number so that you can make
                     //the Creature yell with the correct sound effect attached
@@ -255,7 +255,7 @@ void SimpleAI::UpdateAI(const uint32 diff)
 
                     //Random yell
                     if (Spell[i].TextId[random_text])
-                        DoScriptText(Spell[i].TextId[random_text], m_creature, target);
+                        DoScriptText(Spell[i].TextId[random_text], m_creature, pTarget);
 
                     //Random sound
                     if (Spell[i].Text_Sound[random_text])
@@ -269,7 +269,7 @@ void SimpleAI::UpdateAI(const uint32 diff)
                 Spell_Timer[i] = Spell[i].Cooldown + (rand() % Spell[i].CooldownRandomAddition);
             else Spell_Timer[i] = Spell[i].Cooldown;
 
-        }else Spell_Timer[i] -= diff;
+        } else Spell_Timer[i] -= diff;
 
     }
 
diff --git a/src/bindings/scripts/base/simple_ai.h b/src/bindings/scripts/base/simple_ai.h
index 3a2e8a9341a..6e22f1668ea 100644
--- a/src/bindings/scripts/base/simple_ai.h
+++ b/src/bindings/scripts/base/simple_ai.h
@@ -8,10 +8,10 @@
 enum CastTarget
 {
     CAST_SELF = 0,                  //Self cast
-    CAST_HOSTILE_TARGET,            //Our current target (ie: highest aggro)
+    CAST_HOSTILE_TARGET,            //Our current pTarget (ie: highest aggro)
     CAST_HOSTILE_SECOND_AGGRO,      //Second highest aggro (generaly used for cleaves and some special attacks)
     CAST_HOSTILE_LAST_AGGRO,        //Dead last on aggro (no idea what this could be used for)
-    CAST_HOSTILE_RANDOM,            //Just any random target on our threat list
+    CAST_HOSTILE_RANDOM,            //Just any random pTarget on our threat list
     CAST_FRIENDLY_RANDOM,           //NOT YET IMPLEMENTED
 
     //Special cases