*code cleanup

*totally destroyed m_creature, use "me" for future coding

--HG--
branch : trunk

5 files changed, 94 insertions, 94 deletions

diff --git a/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp b/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp
index 43b38561f1e..d5c7eed469d 100644
--- a/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp
+++ b/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp
@@ -54,11 +54,11 @@ struct boss_drakkari_colossusAI : public ScriptedAI
     {
         if (pInstance)
             pInstance->SetData(DATA_DRAKKARI_COLOSSUS_EVENT, NOT_STARTED);
-        if (!m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE))
-            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
-        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-        m_creature->clearUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT);
-        m_creature->SetReactState(REACT_PASSIVE);
+        if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE))
+            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+        me->clearUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT);
+        me->SetReactState(REACT_PASSIVE);
         MightyBlowTimer = 10*IN_MILISECONDS;
         bHealth = false;
         bHealth1 = false;
@@ -79,14 +79,14 @@ struct boss_drakkari_colossusAI : public ScriptedAI
         {
             pWho->clearUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT);
             pWho->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-            if (pWho == m_creature)
-                m_creature->RemoveAura(SPELL_FREEZE_ANIM);
+            if (pWho == me)
+                me->RemoveAura(SPELL_FREEZE_ANIM);
         }else
         {
             pWho->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             pWho->addUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT);
-            if (pWho == m_creature)
-                DoCast(m_creature,SPELL_FREEZE_ANIM);
+            if (pWho == me)
+                DoCast(me,SPELL_FREEZE_ANIM);
         }
     }
 
@@ -98,27 +98,27 @@ struct boss_drakkari_colossusAI : public ScriptedAI
 
         if (!bHealth && HealthBelowPct(50) &&  !HealthBelowPct(5))
         {
-            CreatureState(m_creature, false);
-            DoCast(m_creature,SPELL_FREEZE_ANIM);
-            DoCast(m_creature,SPELL_EMERGE);
+            CreatureState(me, false);
+            DoCast(me,SPELL_FREEZE_ANIM);
+            DoCast(me,SPELL_EMERGE);
             bHealth = true;
         }
 
         if (!bHealth1 && HealthBelowPct(5))
         {
-            DoCast(m_creature,SPELL_EMERGE);
-            CreatureState(m_creature, false);
+            DoCast(me,SPELL_EMERGE);
+            CreatureState(me, false);
             bHealth1 = true;
-            m_creature->RemoveAllAuras();
+            me->RemoveAllAuras();
         }
 
         if (MightyBlowTimer <= diff)
         {
-            DoCast(m_creature->getVictim(), SPELL_MIGHTY_BLOW, true);
+            DoCast(me->getVictim(), SPELL_MIGHTY_BLOW, true);
             MightyBlowTimer = 10*IN_MILISECONDS;
         } else MightyBlowTimer -= diff;
 
-        if (!m_creature->hasUnitState(UNIT_STAT_STUNNED))
+        if (!me->hasUnitState(UNIT_STAT_STUNNED))
             DoMeleeAttackIfReady();
     }
 
@@ -132,7 +132,7 @@ struct boss_drakkari_colossusAI : public ScriptedAI
     {
         if (HealthBelowPct(5))
             pSummon->DealDamage(pSummon, pSummon->GetHealth() * 0.5 , NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
-        pSummon->AI()->AttackStart(m_creature->getVictim());
+        pSummon->AI()->AttackStart(me->getVictim());
     }
 };
 
@@ -151,27 +151,27 @@ struct boss_drakkari_elementalAI : public ScriptedAI
 
     void Reset()
     {
-        if (Creature *pColossus = Unit::GetCreature(*m_creature, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
-            CAST_AI(boss_drakkari_colossusAI, pColossus->AI())->CreatureState(m_creature, true);
+        if (Creature *pColossus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
+            CAST_AI(boss_drakkari_colossusAI, pColossus->AI())->CreatureState(me, true);
         uiSurgeTimer = 7*IN_MILISECONDS;
         bGoToColossus = false;
     }
 
     void EnterEvadeMode()
     {
-        m_creature->RemoveFromWorld();
+        me->RemoveFromWorld();
     }
 
     void MovementInform(uint32 uiType, uint32 uiId)
     {
         if (uiType != POINT_MOTION_TYPE)
             return;
-        if (Creature *pColossus = Unit::GetCreature(*m_creature, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
+        if (Creature *pColossus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
         {
             CAST_AI(boss_drakkari_colossusAI, pColossus->AI())->CreatureState(pColossus, true);
             CAST_AI(boss_drakkari_colossusAI, pColossus->AI())->bHealth1 = false;
         }
-        m_creature->RemoveFromWorld();
+        me->RemoveFromWorld();
     }
 
     void UpdateAI(const uint32 diff)
@@ -182,11 +182,11 @@ struct boss_drakkari_elementalAI : public ScriptedAI
 
         if (!bGoToColossus && HealthBelowPct(50))
         {
-            if (Creature *pColossus = Unit::GetCreature(*m_creature, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
+            if (Creature *pColossus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
             {
                 if (!CAST_AI(boss_drakkari_colossusAI,pColossus->AI())->HealthBelowPct(6))
                 {
-                    m_creature->InterruptNonMeleeSpells(true);
+                    me->InterruptNonMeleeSpells(true);
                     DoCast(pColossus, SPELL_MERGE);
                     bGoToColossus = true;
                 }
@@ -195,7 +195,7 @@ struct boss_drakkari_elementalAI : public ScriptedAI
 
         if (uiSurgeTimer <= diff)
         {
-            DoCast(m_creature->getVictim(), SPELL_SURGE);
+            DoCast(me->getVictim(), SPELL_SURGE);
             uiSurgeTimer = 7*IN_MILISECONDS;
         } else uiSurgeTimer -= diff;
 
@@ -204,7 +204,7 @@ struct boss_drakkari_elementalAI : public ScriptedAI
 
     void JustDied(Unit* killer)
     {
-        if (Creature *pColossus = Unit::GetCreature(*m_creature, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
+        if (Creature *pColossus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
             pColossus->Kill(pColossus);
     }
 };
@@ -231,20 +231,20 @@ struct npc_living_mojoAI : public ScriptedAI
     {
 
         //Check if the npc is near of Drakkari Colossus.
-        if (Creature *pColossus = Unit::GetCreature(*m_creature, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
+        if (Creature *pColossus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
         {
-            if (pColossus->isAlive() && m_creature->IsInRange3d(pColossus->GetHomePosition().GetPositionX(),pColossus->GetHomePosition().GetPositionY(),pColossus->GetHomePosition().GetPositionZ(),0.0f,17.0f))
-                m_creature->SetReactState(REACT_PASSIVE);
+            if (pColossus->isAlive() && me->IsInRange3d(pColossus->GetHomePosition().GetPositionX(),pColossus->GetHomePosition().GetPositionY(),pColossus->GetHomePosition().GetPositionZ(),0.0f,17.0f))
+                me->SetReactState(REACT_PASSIVE);
             else
-                m_creature->SetReactState(REACT_AGGRESSIVE);
+                me->SetReactState(REACT_AGGRESSIVE);
         }
     }
 
     void DamageTaken(Unit* pDone_by, uint32& uiDamage)
     {
-        if (m_creature->HasReactState(REACT_PASSIVE))
+        if (me->HasReactState(REACT_PASSIVE))
         {
-            if (Creature *pColossus = Unit::GetCreature(*m_creature, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
+            if (Creature *pColossus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
             {
                 if (pColossus->isAlive() && !pColossus->isInCombat())
                 {
@@ -267,13 +267,13 @@ struct npc_living_mojoAI : public ScriptedAI
 
         if (uiMojoWaveTimer <= diff)
         {
-            DoCast(m_creature->getVictim(), SPELL_MOJO_WAVE);
+            DoCast(me->getVictim(), SPELL_MOJO_WAVE);
             uiMojoWaveTimer = 15*IN_MILISECONDS;
         } else uiMojoWaveTimer -= diff;
 
         if (uiMojoPuddleTimer <= diff)
         {
-            DoCast(m_creature->getVictim(), SPELL_MOJO_PUDDLE);
+            DoCast(me->getVictim(), SPELL_MOJO_PUDDLE);
             uiMojoPuddleTimer = 18*IN_MILISECONDS;
         } else uiMojoPuddleTimer -= diff;
 
diff --git a/src/scripts/northrend/gundrak/boss_eck.cpp b/src/scripts/northrend/gundrak/boss_eck.cpp
index 45aa8e84720..cd329119ca8 100644
--- a/src/scripts/northrend/gundrak/boss_eck.cpp
+++ b/src/scripts/northrend/gundrak/boss_eck.cpp
@@ -73,13 +73,13 @@ struct boss_eckAI : public ScriptedAI
 
         if (uiBiteTimer <= diff)
         {
-            DoCast(m_creature->getVictim(), SPELL_ECK_BITE);
+            DoCast(me->getVictim(), SPELL_ECK_BITE);
             uiBiteTimer = urand(8*IN_MILISECONDS,12*IN_MILISECONDS);
         } else uiBiteTimer -= diff;
 
         if (uiSpitTimer <= diff)
         {
-            DoCast(m_creature->getVictim(), SPELL_ECK_SPIT);
+            DoCast(me->getVictim(), SPELL_ECK_SPIT);
             uiSpitTimer = urand(6*IN_MILISECONDS,14*IN_MILISECONDS);
         } else uiSpitTimer -= diff;
 
@@ -98,7 +98,7 @@ struct boss_eckAI : public ScriptedAI
         {
             if (uiBerserkTimer <= diff)
             {
-                DoCast(m_creature, SPELL_ECK_BERSERK);
+                DoCast(me, SPELL_ECK_BERSERK);
                 bBerserk = true;
             }
             else
@@ -106,7 +106,7 @@ struct boss_eckAI : public ScriptedAI
                 uiBerserkTimer -= diff;
                 if (HealthBelowPct(20))
                 {
-                    DoCast(m_creature, SPELL_ECK_BERSERK);
+                    DoCast(me, SPELL_ECK_BERSERK);
                     bBerserk = true;
                 }
             }
@@ -140,9 +140,9 @@ struct npc_ruins_dwellerAI : public ScriptedAI
     {
         if (pInstance)
         {
-            pInstance->SetData64(DATA_RUIN_DWELLER_DIED,m_creature->GetGUID());
+            pInstance->SetData64(DATA_RUIN_DWELLER_DIED,me->GetGUID());
             if (pInstance->GetData(DATA_ALIVE_RUIN_DWELLERS) == 0)
-                m_creature->SummonCreature(CREATURE_ECK, EckSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300*IN_MILISECONDS);
+                me->SummonCreature(CREATURE_ECK, EckSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300*IN_MILISECONDS);
         }
     }
 };
diff --git a/src/scripts/northrend/gundrak/boss_gal_darah.cpp b/src/scripts/northrend/gundrak/boss_gal_darah.cpp
index dee1b2c6d1e..a5e4bb02cf3 100644
--- a/src/scripts/northrend/gundrak/boss_gal_darah.cpp
+++ b/src/scripts/northrend/gundrak/boss_gal_darah.cpp
@@ -110,7 +110,7 @@ struct boss_gal_darahAI : public ScriptedAI
 
         Phase = TROLL;
 
-        m_creature->SetDisplayId(DISPLAY_TROLL);
+        me->SetDisplayId(DISPLAY_TROLL);
 
         if (pInstance)
             pInstance->SetData(DATA_GAL_DARAH_EVENT, NOT_STARTED);
@@ -118,7 +118,7 @@ struct boss_gal_darahAI : public ScriptedAI
 
     void EnterCombat(Unit* who)
     {
-        DoScriptText(SAY_AGGRO, m_creature);
+        DoScriptText(SAY_AGGRO, me);
 
         if (pInstance)
             pInstance->SetData(DATA_GAL_DARAH_EVENT, IN_PROGRESS);
@@ -137,14 +137,14 @@ struct boss_gal_darahAI : public ScriptedAI
                 {
                     if (uiTransformationTimer <= diff)
                     {
-                        m_creature->SetDisplayId(DISPLAY_RHINO);
+                        me->SetDisplayId(DISPLAY_RHINO);
                         Phase = RHINO;
                         uiPhaseCounter = 0;
-                        DoScriptText(SAY_TRANSFORM_1, m_creature);
+                        DoScriptText(SAY_TRANSFORM_1, me);
                         uiTransformationTimer = 5*IN_MILISECONDS;
                         bStartOfTransformation = true;
-                        m_creature->clearUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT);
-                        m_creature->SetReactState(REACT_AGGRESSIVE);
+                        me->clearUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT);
+                        me->SetReactState(REACT_AGGRESSIVE);
                     }
                     else
                     {
@@ -153,8 +153,8 @@ struct boss_gal_darahAI : public ScriptedAI
                         if (bStartOfTransformation)
                         {
                             bStartOfTransformation = false;
-                            m_creature->addUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT);
-                            m_creature->SetReactState(REACT_PASSIVE);
+                            me->addUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT);
+                            me->SetReactState(REACT_PASSIVE);
                         }
                     }
                 }
@@ -162,14 +162,14 @@ struct boss_gal_darahAI : public ScriptedAI
                 {
                     if (uiStampedeTimer <= diff)
                     {
-                        DoCast(m_creature, SPELL_STAMPEDE);
-                        DoScriptText(RAND(SAY_SUMMON_RHINO_1,SAY_SUMMON_RHINO_2,SAY_SUMMON_RHINO_3),m_creature);
+                        DoCast(me, SPELL_STAMPEDE);
+                        DoScriptText(RAND(SAY_SUMMON_RHINO_1,SAY_SUMMON_RHINO_2,SAY_SUMMON_RHINO_3),me);
                         uiStampedeTimer = 15*IN_MILISECONDS;
                     } else uiStampedeTimer -= diff;
 
                     if (uiWhirlingSlashTimer <= diff)
                     {
-                        DoCast(m_creature->getVictim(), SPELL_WHIRLING_SLASH);
+                        DoCast(me->getVictim(), SPELL_WHIRLING_SLASH);
                         uiWhirlingSlashTimer = 21*IN_MILISECONDS;
                         ++uiPhaseCounter;
                     } else uiWhirlingSlashTimer -= diff;
@@ -180,14 +180,14 @@ struct boss_gal_darahAI : public ScriptedAI
                 {
                     if (uiTransformationTimer <= diff)
                     {
-                        m_creature->SetDisplayId(DISPLAY_TROLL);
+                        me->SetDisplayId(DISPLAY_TROLL);
                         Phase = TROLL;
                         uiPhaseCounter = 0;
-                        DoScriptText(SAY_TRANSFORM_2, m_creature);
+                        DoScriptText(SAY_TRANSFORM_2, me);
                         uiTransformationTimer = 9*IN_MILISECONDS;
                         bStartOfTransformation = true;
-                        m_creature->clearUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT);
-                        m_creature->SetReactState(REACT_AGGRESSIVE);
+                        me->clearUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT);
+                        me->SetReactState(REACT_AGGRESSIVE);
                     }
                     else
                     {
@@ -196,8 +196,8 @@ struct boss_gal_darahAI : public ScriptedAI
                         if (bStartOfTransformation)
                         {
                             bStartOfTransformation = false;
-                            m_creature->addUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT);
-                            m_creature->SetReactState(REACT_PASSIVE);
+                            me->addUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT);
+                            me->SetReactState(REACT_PASSIVE);
                         }
                     }
                 }
@@ -205,19 +205,19 @@ struct boss_gal_darahAI : public ScriptedAI
                 {
                     if (uiPunctureTimer <= diff)
                     {
-                        DoCast(m_creature->getVictim(), SPELL_PUNCTURE);
+                        DoCast(me->getVictim(), SPELL_PUNCTURE);
                         uiPunctureTimer = 8*IN_MILISECONDS;
                     } else uiPunctureTimer -= diff;
 
                     if (uiEnrageTimer <= diff)
                     {
-                        DoCast(m_creature->getVictim(), SPELL_ENRAGE);
+                        DoCast(me->getVictim(), SPELL_ENRAGE);
                         uiEnrageTimer = 20*IN_MILISECONDS;
                     } else uiEnrageTimer -= diff;
 
                     if (uiStompTimer <= diff)
                     {
-                        DoCast(m_creature->getVictim(), SPELL_STOMP);
+                        DoCast(me->getVictim(), SPELL_STOMP);
                         uiStompTimer = 20*IN_MILISECONDS;
                     } else uiStompTimer -= diff;
 
@@ -240,7 +240,7 @@ struct boss_gal_darahAI : public ScriptedAI
 
     void JustDied(Unit* killer)
     {
-        DoScriptText(SAY_DEATH, m_creature);
+        DoScriptText(SAY_DEATH, me);
 
         if (pInstance)
         {
@@ -265,10 +265,10 @@ struct boss_gal_darahAI : public ScriptedAI
 
     void KilledUnit(Unit *victim)
     {
-        if (victim == m_creature)
+        if (victim == me)
             return;
 
-        DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), m_creature);
+        DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me);
     }
 };
 
diff --git a/src/scripts/northrend/gundrak/boss_moorabi.cpp b/src/scripts/northrend/gundrak/boss_moorabi.cpp
index 9e6899408eb..bd832061dab 100644
--- a/src/scripts/northrend/gundrak/boss_moorabi.cpp
+++ b/src/scripts/northrend/gundrak/boss_moorabi.cpp
@@ -79,8 +79,8 @@ struct boss_moorabiAI : public ScriptedAI
 
     void EnterCombat(Unit* pWho)
     {
-        DoScriptText(SAY_AGGRO, m_creature);
-        DoCast(m_creature, SPELL_MOJO_FRENZY, true);
+        DoScriptText(SAY_AGGRO, me);
+        DoCast(me, SPELL_MOJO_FRENZY, true);
 
         if (pInstance)
             pInstance->SetData(DATA_MOORABI_EVENT, IN_PROGRESS);
@@ -92,45 +92,45 @@ struct boss_moorabiAI : public ScriptedAI
          if (!UpdateVictim())
              return;
 
-        if (!bPhase && m_creature->HasAura(SPELL_TRANSFORMATION))
+        if (!bPhase && me->HasAura(SPELL_TRANSFORMATION))
         {
             bPhase = true;
-            m_creature->RemoveAura(SPELL_MOJO_FRENZY);
+            me->RemoveAura(SPELL_MOJO_FRENZY);
         }
 
         if (uiGroundTremorTimer <= uiDiff)
         {
-            DoScriptText(SAY_QUAKE, m_creature);
+            DoScriptText(SAY_QUAKE, me);
             if (bPhase)
-                DoCast(m_creature->getVictim(), SPELL_QUAKE, true);
+                DoCast(me->getVictim(), SPELL_QUAKE, true);
             else
-                DoCast(m_creature->getVictim(), SPELL_GROUND_TREMOR, true);
+                DoCast(me->getVictim(), SPELL_GROUND_TREMOR, true);
             uiGroundTremorTimer = 10*IN_MILISECONDS;
         } else uiGroundTremorTimer -= uiDiff;
 
         if (uiNumblingShoutTimer <= uiDiff)
         {
             if (bPhase)
-                DoCast(m_creature->getVictim(), SPELL_NUMBING_ROAR, true);
+                DoCast(me->getVictim(), SPELL_NUMBING_ROAR, true);
             else
-                DoCast(m_creature->getVictim(), SPELL_NUMBING_SHOUT, true);
+                DoCast(me->getVictim(), SPELL_NUMBING_SHOUT, true);
             uiNumblingShoutTimer = 10*IN_MILISECONDS;
         } else uiNumblingShoutTimer -=uiDiff;
 
         if (uiDeterminedStabTimer <= uiDiff)
         {
             if (bPhase)
-                DoCast(m_creature->getVictim(), SPELL_DETERMINED_GORE);
+                DoCast(me->getVictim(), SPELL_DETERMINED_GORE);
             else
-                DoCast(m_creature->getVictim(), SPELL_DETERMINED_STAB, true);
+                DoCast(me->getVictim(), SPELL_DETERMINED_STAB, true);
             uiDeterminedStabTimer = 8*IN_MILISECONDS;
         } else uiDeterminedStabTimer -=uiDiff;
 
         if (!bPhase && uiTransformationTImer <= uiDiff)
         {
-            DoScriptText(EMOTE_TRANSFORM, m_creature);
-            DoScriptText(SAY_TRANSFORM, m_creature);
-            DoCast(m_creature, SPELL_TRANSFORMATION, false);
+            DoScriptText(EMOTE_TRANSFORM, me);
+            DoScriptText(SAY_TRANSFORM, me);
+            DoCast(me, SPELL_TRANSFORMATION, false);
             uiTransformationTImer = 10*IN_MILISECONDS;
         } else uiTransformationTImer -= uiDiff;
 
@@ -139,7 +139,7 @@ struct boss_moorabiAI : public ScriptedAI
 
      void JustDied(Unit* pKiller)
      {
-        DoScriptText(SAY_DEATH, m_creature);
+        DoScriptText(SAY_DEATH, me);
 
         if (pInstance)
         {
@@ -152,10 +152,10 @@ struct boss_moorabiAI : public ScriptedAI
 
     void KilledUnit(Unit* pVictim)
     {
-        if (pVictim == m_creature)
+        if (pVictim == me)
             return;
 
-        DoScriptText(RAND(SAY_SLAY_2,SAY_SLAY_3), m_creature);
+        DoScriptText(RAND(SAY_SLAY_2,SAY_SLAY_3), me);
     }
 };
 
diff --git a/src/scripts/northrend/gundrak/boss_slad_ran.cpp b/src/scripts/northrend/gundrak/boss_slad_ran.cpp
index 8d8b0f84833..ccc28654d2c 100644
--- a/src/scripts/northrend/gundrak/boss_slad_ran.cpp
+++ b/src/scripts/northrend/gundrak/boss_slad_ran.cpp
@@ -100,7 +100,7 @@ struct boss_slad_ranAI : public ScriptedAI
 
     void EnterCombat(Unit* who)
     {
-        DoScriptText(SAY_AGGRO, m_creature);
+        DoScriptText(SAY_AGGRO, me);
 
         if (pInstance)
             pInstance->SetData(DATA_SLAD_RAN_EVENT, IN_PROGRESS);
@@ -114,19 +114,19 @@ struct boss_slad_ranAI : public ScriptedAI
 
         if (uiPoisonNovaTimer <= diff)
         {
-            DoCast(m_creature->getVictim(), SPELL_POISON_NOVA);
+            DoCast(me->getVictim(), SPELL_POISON_NOVA);
             uiPoisonNovaTimer = 15*IN_MILISECONDS;
         } else uiPoisonNovaTimer -= diff;
 
         if (uiPowerfullBiteTimer <= diff)
         {
-            DoCast(m_creature->getVictim(), SPELL_POWERFULL_BITE);
+            DoCast(me->getVictim(), SPELL_POWERFULL_BITE);
             uiPowerfullBiteTimer = 10*IN_MILISECONDS;
         } else uiPowerfullBiteTimer -= diff;
 
         if (uiVenomBoltTimer <= diff)
         {
-            DoCast(m_creature->getVictim(), SPELL_VENOM_BOLT);
+            DoCast(me->getVictim(), SPELL_VENOM_BOLT);
             uiVenomBoltTimer = 10*IN_MILISECONDS;
         } else uiVenomBoltTimer -= diff;
 
@@ -136,23 +136,23 @@ struct boss_slad_ranAI : public ScriptedAI
             {
                 if (uiPhase == 1)
                     for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i)
-                        m_creature->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS);
+                        me->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS);
                 if (uiPhase == 2)
                     for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i)
-                        m_creature->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS);
+                        me->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS);
                 uiSpawnTimer = 5*IN_MILISECONDS;
             } else uiSpawnTimer -= diff;
         }
 
         if (uiPhase == 0 && HealthBelowPct(30))
         {
-            DoScriptText(SAY_SUMMON_SNAKES,m_creature);
+            DoScriptText(SAY_SUMMON_SNAKES,me);
             uiPhase = 1;
         }
 
         if (uiPhase == 1 && HealthBelowPct(25))
         {
-            DoScriptText(SAY_SUMMON_CONSTRICTORS,m_creature);
+            DoScriptText(SAY_SUMMON_CONSTRICTORS,me);
             uiPhase = 2;
         }
 
@@ -161,7 +161,7 @@ struct boss_slad_ranAI : public ScriptedAI
 
     void JustDied(Unit* killer)
     {
-        DoScriptText(SAY_DEATH, m_creature);
+        DoScriptText(SAY_DEATH, me);
 
         if (pInstance)
             pInstance->SetData(DATA_SLAD_RAN_EVENT, DONE);
@@ -169,12 +169,12 @@ struct boss_slad_ranAI : public ScriptedAI
 
     void KilledUnit(Unit *victim)
     {
-        DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), m_creature);
+        DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me);
     }
 
     void JustSummoned(Creature* summoned)
     {
-        summoned->GetMotionMaster()->MovePoint(0,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ());
+        summoned->GetMotionMaster()->MovePoint(0,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ());
         lSummons.Summon(summoned);
     }
 };
@@ -196,7 +196,7 @@ struct mob_slad_ran_constrictorAI : public ScriptedAI
             return;
         if (uiGripOfSladRanTimer <= diff)
         {
-            DoCast(m_creature->getVictim(), SPELL_GRIP_OF_SLAD_RAN);
+            DoCast(me->getVictim(), SPELL_GRIP_OF_SLAD_RAN);
             uiGripOfSladRanTimer = 5*IN_MILISECONDS;
         } else uiGripOfSladRanTimer -= diff;
     }
@@ -224,7 +224,7 @@ struct mob_slad_ran_viperAI : public ScriptedAI
 
         if (uiVenomousBiteTimer <= diff)
         {
-            DoCast(m_creature->getVictim(), SPELL_VENOMOUS_BITE);
+            DoCast(me->getVictim(), SPELL_VENOMOUS_BITE);
             uiVenomousBiteTimer = 10*IN_MILISECONDS;
         } else uiVenomousBiteTimer -= diff;
     }