*code cleanup

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

--HG--
branch : trunk

9 files changed, 116 insertions, 116 deletions

diff --git a/src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp b/src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp
index dc7a3c71a5c..81b9b02701f 100644
--- a/src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp
+++ b/src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp
@@ -98,11 +98,11 @@ struct boss_malygosAI : public ScriptedAI
     void EnterCombat(Unit* who)
     {
         if (phase == 1)
-            DoScriptText(SAY_PHASE1_AGGRO, m_creature);
+            DoScriptText(SAY_PHASE1_AGGRO, me);
         if (phase == 2)
-            DoScriptText(SAY_PHASE1_AGGRO, m_creature);
+            DoScriptText(SAY_PHASE1_AGGRO, me);
         if (phase == 3)
-            DoScriptText(SAY_PHASE1_AGGRO, m_creature);
+            DoScriptText(SAY_PHASE1_AGGRO, me);
     }
     void AttackStart(Unit* who) {}
     void MoveInLineOfSight(Unit* who) {}
@@ -113,7 +113,7 @@ struct boss_malygosAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) <= 50){
+        if ((me->GetHealth()*100 / me->GetMaxHealth()) <= 50){
             phase = 2;
             //spawn adds
             //set malygos unatackable untill all adds spawned dead
@@ -124,19 +124,19 @@ struct boss_malygosAI : public ScriptedAI
     }
     void JustDied(Unit* killer)
     {
-        DoScriptText(SAY_DEATH, m_creature);
+        DoScriptText(SAY_DEATH, me);
     }
     void KilledUnit(Unit *victim)
     {
-        if (victim == m_creature)
+        if (victim == me)
             return;
 
         if (phase == 1)
-            DoScriptText(RAND(SAY_PHASE1_SLAY_1,SAY_PHASE1_SLAY_2,SAY_PHASE1_SLAY_3), m_creature);
+            DoScriptText(RAND(SAY_PHASE1_SLAY_1,SAY_PHASE1_SLAY_2,SAY_PHASE1_SLAY_3), me);
         if (phase == 2)
-            DoScriptText(RAND(SAY_PHASE2_SLAY_1,SAY_PHASE2_SLAY_2,SAY_PHASE2_SLAY_3), m_creature);
+            DoScriptText(RAND(SAY_PHASE2_SLAY_1,SAY_PHASE2_SLAY_2,SAY_PHASE2_SLAY_3), me);
         if (phase == 3)
-            DoScriptText(RAND(SAY_PHASE3_SLAY_1,SAY_PHASE3_SLAY_2,SAY_PHASE3_SLAY_3), m_creature);
+            DoScriptText(RAND(SAY_PHASE3_SLAY_1,SAY_PHASE3_SLAY_2,SAY_PHASE3_SLAY_3), me);
     }
 };
 
diff --git a/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp b/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp
index 837d0fde41b..5f936ac0374 100644
--- a/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp
+++ b/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp
@@ -88,7 +88,7 @@ struct boss_anomalusAI : public ScriptedAI
 
     void EnterCombat(Unit* who)
     {
-        DoScriptText(SAY_AGGRO, m_creature);
+        DoScriptText(SAY_AGGRO, me);
 
         if (pInstance)
             pInstance->SetData(DATA_ANOMALUS_EVENT, IN_PROGRESS);
@@ -96,7 +96,7 @@ struct boss_anomalusAI : public ScriptedAI
 
     void JustDied(Unit* killer)
     {
-        DoScriptText(SAY_DEATH, m_creature);
+        DoScriptText(SAY_DEATH, me);
 
         if (pInstance)
         {
@@ -111,21 +111,21 @@ struct boss_anomalusAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if (m_creature->GetDistance(m_creature->GetHomePosition()) > 60.0f)
+        if (me->GetDistance(me->GetHomePosition()) > 60.0f)
         {
             //Not blizzlike, hack to avoid an exploit
             EnterEvadeMode();
             return;
         }
 
-        if (m_creature->HasAura(SPELL_RIFT_SHIELD))
+        if (me->HasAura(SPELL_RIFT_SHIELD))
         {
             if (uiChaoticRiftGUID)
             {
-                Unit* Rift = Unit::GetUnit((*m_creature), uiChaoticRiftGUID);
+                Unit* Rift = Unit::GetUnit((*me), uiChaoticRiftGUID);
                 if (Rift && Rift->isDead())
                 {
-                    m_creature->RemoveAurasDueToSpell(SPELL_RIFT_SHIELD);
+                    me->RemoveAurasDueToSpell(SPELL_RIFT_SHIELD);
                     uiChaoticRiftGUID = 0;
                 }
                 return;
@@ -136,16 +136,16 @@ struct boss_anomalusAI : public ScriptedAI
         if ((Phase == 0) && HealthBelowPct(50))
         {
             Phase = 1;
-            DoScriptText(SAY_SHIELD, m_creature);
-            DoCast(m_creature, SPELL_RIFT_SHIELD);
-            Creature* Rift = m_creature->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0,5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS);
+            DoScriptText(SAY_SHIELD, me);
+            DoCast(me, SPELL_RIFT_SHIELD);
+            Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0,5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS);
             if (Rift)
             {
                 //DoCast(Rift, SPELL_CHARGE_RIFT);
                 if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
                     Rift->AI()->AttackStart(pTarget);
                 uiChaoticRiftGUID = Rift->GetGUID();
-                DoScriptText(SAY_RIFT , m_creature);
+                DoScriptText(SAY_RIFT , me);
             }
         }
 
@@ -189,15 +189,15 @@ struct mob_chaotic_riftAI : public Scripted_NoMovementAI
     {
         uiChaoticEnergyBurstTimer = 1*IN_MILISECONDS;
         uiSummonCrazedManaWraithTimer = 5*IN_MILISECONDS;
-        //m_creature->SetDisplayId(25206); //For some reason in DB models for ally and horde are different.
+        //me->SetDisplayId(25206); //For some reason in DB models for ally and horde are different.
                                          //Model for ally (1126) does not show auras. Horde model works perfect.
                                          //Set model to horde number
-        DoCast(m_creature, SPELL_ARCANEFORM, false);
+        DoCast(me, SPELL_ARCANEFORM, false);
     }
 
     void JustDied(Unit *killer)
     {
-        if (Creature* pAnomalus = Unit::GetCreature(*m_creature, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0))
+        if (Creature* pAnomalus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0))
             CAST_AI(boss_anomalusAI,pAnomalus->AI())->bDeadChaoticRift = true;
     }
 
@@ -208,7 +208,7 @@ struct mob_chaotic_riftAI : public Scripted_NoMovementAI
 
         if (uiChaoticEnergyBurstTimer <= diff)
         {
-            Unit* pAnomalus = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0);
+            Unit* pAnomalus = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0);
             if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 if (pAnomalus && pAnomalus->HasAura(SPELL_RIFT_SHIELD))
                     DoCast(pTarget, SPELL_CHARGED_CHAOTIC_ENERGY_BURST);
@@ -219,11 +219,11 @@ struct mob_chaotic_riftAI : public Scripted_NoMovementAI
 
         if (uiSummonCrazedManaWraithTimer <= diff)
         {
-            Creature* Wraith = m_creature->SummonCreature(MOB_CRAZED_MANA_WRAITH, m_creature->GetPositionX()+1, m_creature->GetPositionY()+1, m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS);
+            Creature* Wraith = me->SummonCreature(MOB_CRAZED_MANA_WRAITH, me->GetPositionX()+1, me->GetPositionY()+1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS);
             if (Wraith)
                 if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
                     Wraith->AI()->AttackStart(pTarget);
-            Unit* Anomalus = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0);
+            Unit* Anomalus = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0);
             if (Anomalus && Anomalus->HasAura(SPELL_RIFT_SHIELD))
                 uiSummonCrazedManaWraithTimer = 5*IN_MILISECONDS;
             else
diff --git a/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp b/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp
index d907f8f8d6e..10ccc80035c 100644
--- a/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp
+++ b/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp
@@ -78,7 +78,7 @@ struct boss_keristraszaAI : public ScriptedAI
         uiCheckIntenseColdTimer = 2*IN_MILISECONDS;
         bMoreThanTwoIntenseCold = false;
 
-        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
+        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
 
         RemovePrison(CheckContainmentSpheres());
 
@@ -88,7 +88,7 @@ struct boss_keristraszaAI : public ScriptedAI
 
     void EnterCombat(Unit* who)
     {
-        DoScriptText(SAY_AGGRO, m_creature);
+        DoScriptText(SAY_AGGRO, me);
         DoCastAOE(SPELL_INTENSE_COLD);
 
         if (pInstance)
@@ -97,7 +97,7 @@ struct boss_keristraszaAI : public ScriptedAI
 
     void JustDied(Unit* killer)
     {
-        DoScriptText(SAY_DEATH, m_creature);
+        DoScriptText(SAY_DEATH, me);
 
         if (pInstance)
         {
@@ -109,7 +109,7 @@ struct boss_keristraszaAI : public ScriptedAI
 
     void KilledUnit(Unit *victim)
     {
-        DoScriptText(SAY_SLAY, m_creature);
+        DoScriptText(SAY_SLAY, me);
     }
 
     bool CheckContainmentSpheres(bool remove_prison = false)
@@ -140,16 +140,16 @@ struct boss_keristraszaAI : public ScriptedAI
     {
         if (remove)
         {
-            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
-            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-            if (m_creature->HasAura(SPELL_FROZEN_PRISON))
-                m_creature->RemoveAurasDueToSpell(SPELL_FROZEN_PRISON);
+            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+            if (me->HasAura(SPELL_FROZEN_PRISON))
+                me->RemoveAurasDueToSpell(SPELL_FROZEN_PRISON);
         }
         else
         {
-            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
-            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-            DoCast(m_creature, SPELL_FROZEN_PRISON, false);
+            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+            DoCast(me, SPELL_FROZEN_PRISON, false);
         }
     }
 
@@ -160,10 +160,10 @@ struct boss_keristraszaAI : public ScriptedAI
 
         if (uiCheckIntenseColdTimer < diff && !bMoreThanTwoIntenseCold)
         {
-            std::list<HostileReference*> ThreatList = m_creature->getThreatManager().getThreatList();
+            std::list<HostileReference*> ThreatList = me->getThreatManager().getThreatList();
             for (std::list<HostileReference*>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr)
             {
-                Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
+                Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid());
                 if (!pTarget || pTarget->GetTypeId() != TYPEID_PLAYER)
                     continue;
 
@@ -179,28 +179,28 @@ struct boss_keristraszaAI : public ScriptedAI
 
         if (!bEnrage && HealthBelowPct(25))
         {
-            DoScriptText(SAY_ENRAGE, m_creature);
-            DoCast(m_creature, SPELL_ENRAGE);
+            DoScriptText(SAY_ENRAGE, me);
+            DoCast(me, SPELL_ENRAGE);
             bEnrage = true;
         }
 
         if (uiCrystalfireBreathTimer <= diff)
         {
-            DoCast(m_creature->getVictim(), SPELL_CRYSTALFIRE_BREATH);
+            DoCast(me->getVictim(), SPELL_CRYSTALFIRE_BREATH);
             uiCrystalfireBreathTimer = 14*IN_MILISECONDS;
         } else uiCrystalfireBreathTimer -= diff;
 
         if (uiTailSweepTimer <= diff)
         {
-            DoCast(m_creature, SPELL_TAIL_SWEEP);
+            DoCast(me, SPELL_TAIL_SWEEP);
             uiTailSweepTimer = 5*IN_MILISECONDS;
         } else uiTailSweepTimer -= diff;
 
         if (uiCrystalChainsCrystalizeTimer <= diff)
         {
-            DoScriptText(SAY_CRYSTAL_NOVA, m_creature);
+            DoScriptText(SAY_CRYSTAL_NOVA, me);
             if (IsHeroic())
-                DoCast(m_creature, SPELL_CRYSTALIZE);
+                DoCast(me, SPELL_CRYSTALIZE);
             else if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_CRYSTAL_CHAINS);
             uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILISECONDS,11*IN_MILISECONDS);
diff --git a/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp b/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp
index 661deb1d73d..7441087382d 100644
--- a/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp
+++ b/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp
@@ -102,8 +102,8 @@ struct boss_magus_telestraAI : public ScriptedAI
         bIsAchievementTimerRunning = false;
         bIsWaitingToAppear = false;
 
-        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-        m_creature->SetVisibility(VISIBILITY_ON);
+        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        me->SetVisibility(VISIBILITY_ON);
 
         if (pInstance)
             pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED);
@@ -111,7 +111,7 @@ struct boss_magus_telestraAI : public ScriptedAI
 
     void EnterCombat(Unit* who)
     {
-        DoScriptText(SAY_AGGRO, m_creature);
+        DoScriptText(SAY_AGGRO, me);
 
         if (pInstance)
             pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS);
@@ -119,7 +119,7 @@ struct boss_magus_telestraAI : public ScriptedAI
 
     void JustDied(Unit* killer)
     {
-        DoScriptText(SAY_DEATH, m_creature);
+        DoScriptText(SAY_DEATH, me);
 
         if (pInstance)
         {
@@ -131,12 +131,12 @@ struct boss_magus_telestraAI : public ScriptedAI
 
     void KilledUnit(Unit *victim)
     {
-        DoScriptText(SAY_KILL, m_creature);
+        DoScriptText(SAY_KILL, me);
     }
 
     uint64 SplitPersonality(uint32 entry)
     {
-        if (Creature* Summoned = m_creature->SummonCreature(entry, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), m_creature->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS))
+        if (Creature* Summoned = me->SummonCreature(entry, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS))
         {
             switch (entry)
             {
@@ -193,11 +193,11 @@ struct boss_magus_telestraAI : public ScriptedAI
 
         if (bIsWaitingToAppear)
         {
-            m_creature->StopMoving();
-            m_creature->AttackStop();
+            me->StopMoving();
+            me->AttackStop();
             if (uiIsWaitingToAppearTimer <= diff)
             {
-                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 bIsWaitingToAppear = false;
             } else uiIsWaitingToAppearTimer -= diff;
             return;
@@ -211,10 +211,10 @@ struct boss_magus_telestraAI : public ScriptedAI
             {
                 if (uiAchievementTimer <= ACHIEV_TIMER)
                     uiAchievementProgress +=1;
-                m_creature->GetMotionMaster()->Clear();
-                m_creature->GetMap()->CreatureRelocation(m_creature, CenterOfRoom.GetPositionX(), CenterOfRoom.GetPositionY(), CenterOfRoom.GetPositionZ(), CenterOfRoom.GetOrientation());
-                DoCast(m_creature, SPELL_TELESTRA_BACK);
-                m_creature->SetVisibility(VISIBILITY_ON);
+                me->GetMotionMaster()->Clear();
+                me->GetMap()->CreatureRelocation(me, CenterOfRoom.GetPositionX(), CenterOfRoom.GetPositionY(), CenterOfRoom.GetPositionZ(), CenterOfRoom.GetOrientation());
+                DoCast(me, SPELL_TELESTRA_BACK);
+                me->SetVisibility(VISIBILITY_ON);
                 if (Phase == 1)
                     Phase = 2;
                 if (Phase == 3)
@@ -224,7 +224,7 @@ struct boss_magus_telestraAI : public ScriptedAI
                 uiArcaneMagusGUID = 0;
                 bIsWaitingToAppear = true;
                 uiIsWaitingToAppearTimer = 4*IN_MILISECONDS;
-                DoScriptText(SAY_MERGE, m_creature);
+                DoScriptText(SAY_MERGE, me);
                 bIsAchievementTimerRunning = false;
                 uiAchievementTimer = 0;
             }
@@ -235,34 +235,34 @@ struct boss_magus_telestraAI : public ScriptedAI
         if ((Phase == 0) && HealthBelowPct(50))
         {
             Phase = 1;
-            m_creature->CastStop();
-            m_creature->RemoveAllAuras();
-            m_creature->SetVisibility(VISIBILITY_OFF);
-            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            me->CastStop();
+            me->RemoveAllAuras();
+            me->SetVisibility(VISIBILITY_OFF);
+            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS);
             uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS);
             uiArcaneMagusGUID = SplitPersonality(MOB_ARCANE_MAGUS);
             bFireMagusDead = false;
             bFrostMagusDead = false;
             bArcaneMagusDead = false;
-            DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), m_creature);
+            DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me);
             return;
         }
 
         if (IsHeroic() && (Phase == 2) && HealthBelowPct(10))
         {
             Phase = 3;
-            m_creature->CastStop();
-            m_creature->RemoveAllAuras();
-            m_creature->SetVisibility(VISIBILITY_OFF);
-            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            me->CastStop();
+            me->RemoveAllAuras();
+            me->SetVisibility(VISIBILITY_OFF);
+            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS);
             uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS);
             uiArcaneMagusGUID = SplitPersonality(MOB_ARCANE_MAGUS);
             bFireMagusDead = false;
             bFrostMagusDead = false;
             bArcaneMagusDead = false;
-            DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), m_creature);
+            DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me);
             return;
         }
 
@@ -289,7 +289,7 @@ struct boss_magus_telestraAI : public ScriptedAI
 
         if (uiGravityWellTimer <= diff)
         {
-            if (Unit *pTarget = m_creature->getVictim())
+            if (Unit *pTarget = me->getVictim())
             {
                 DoCast(pTarget, SPELL_GRAVITY_WELL);
                 uiCooldown = 6*IN_MILISECONDS;
diff --git a/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp b/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp
index d62d9404886..aabf8eaa71d 100644
--- a/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp
+++ b/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp
@@ -88,7 +88,7 @@ struct boss_ormorokAI : public ScriptedAI
 
     void EnterCombat(Unit* who)
     {
-        DoScriptText(SAY_AGGRO, m_creature);
+        DoScriptText(SAY_AGGRO, me);
 
         if (pInstance)
             pInstance->SetData(DATA_ORMOROK_EVENT, IN_PROGRESS);
@@ -96,7 +96,7 @@ struct boss_ormorokAI : public ScriptedAI
 
     void JustDied(Unit* killer)
     {
-        DoScriptText(SAY_DEATH, m_creature);
+        DoScriptText(SAY_DEATH, me);
 
         if (pInstance)
             pInstance->SetData(DATA_ORMOROK_EVENT, DONE);
@@ -104,7 +104,7 @@ struct boss_ormorokAI : public ScriptedAI
 
     void KilledUnit(Unit *victim)
     {
-        DoScriptText(SAY_KILL, m_creature);
+        DoScriptText(SAY_KILL, me);
     }
 
     void UpdateAI(const uint32 diff)
@@ -125,47 +125,47 @@ struct boss_ormorokAI : public ScriptedAI
                 fSpikeXY[3][0] = fBaseX-(SPIKE_DISTANCE*uiCrystalSpikesCount*cos(fBaseO-(M_PI/2)));
                 fSpikeXY[3][1] = fBaseY-(SPIKE_DISTANCE*uiCrystalSpikesCount*sin(fBaseO-(M_PI/2)));
                 for (uint8 i = 0; i < 4; ++i)
-                    Creature* Spike = m_creature->SummonCreature(MOB_CRYSTAL_SPIKE, fSpikeXY[i][0], fSpikeXY[i][1], fBaseZ, 0, TEMPSUMMON_TIMED_DESPAWN, 7*IN_MILISECONDS);
+                    Creature* Spike = me->SummonCreature(MOB_CRYSTAL_SPIKE, fSpikeXY[i][0], fSpikeXY[i][1], fBaseZ, 0, TEMPSUMMON_TIMED_DESPAWN, 7*IN_MILISECONDS);
                 if (++uiCrystalSpikesCount >= 13)
                     bCrystalSpikes = false;
                 uiCrystalSpikesTimer2 = 200;
             } else uiCrystalSpikesTimer2 -= diff;
 
-        if (!bFrenzy && (m_creature->GetHealth() < m_creature->GetMaxHealth() * 0.25))
+        if (!bFrenzy && (me->GetHealth() < me->GetMaxHealth() * 0.25))
         {
-            DoCast(m_creature, SPELL_FRENZY);
+            DoCast(me, SPELL_FRENZY);
             bFrenzy = true;
         }
 
         if (uiTrampleTimer <= diff)
         {
-            DoCast(m_creature, SPELL_TRAMPLE);
+            DoCast(me, SPELL_TRAMPLE);
             uiTrampleTimer = 10*IN_MILISECONDS;
         } else uiTrampleTimer -= diff;
 
         if (uiSpellReflectionTimer <= diff)
         {
-            DoScriptText(SAY_REFLECT, m_creature);
-            DoCast(m_creature, SPELL_SPELL_REFLECTION);
+            DoScriptText(SAY_REFLECT, me);
+            DoCast(me, SPELL_SPELL_REFLECTION);
             uiSpellReflectionTimer = 30*IN_MILISECONDS;
         } else uiSpellReflectionTimer -= diff;
 
         if (uiCrystalSpikesTimer <= diff)
         {
-            DoScriptText(SAY_CRYSTAL_SPIKES, m_creature);
+            DoScriptText(SAY_CRYSTAL_SPIKES, me);
             bCrystalSpikes = true;
             uiCrystalSpikesCount = 1;
             uiCrystalSpikesTimer2 = 0;
-            fBaseX = m_creature->GetPositionX();
-            fBaseY = m_creature->GetPositionY();
-            fBaseZ = m_creature->GetPositionZ();
-            fBaseO = m_creature->GetOrientation();
+            fBaseX = me->GetPositionX();
+            fBaseY = me->GetPositionY();
+            fBaseZ = me->GetPositionZ();
+            fBaseO = me->GetOrientation();
             uiCrystalSpikesTimer = 20*IN_MILISECONDS;
         } else uiCrystalSpikesTimer -= diff;
 
         if (IsHeroic() && (uiSummonCrystallineTanglerTimer <= diff))
         {
-            Creature* Crystalline_Tangler = m_creature->SummonCreature(MOB_CRYSTALLINE_TANGLER, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), m_creature->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
+            Creature* Crystalline_Tangler = me->SummonCreature(MOB_CRYSTALLINE_TANGLER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
             if (Crystalline_Tangler)
             {
                 Unit *pTarget = NULL;
@@ -179,10 +179,10 @@ struct boss_ormorokAI : public ScriptedAI
                         case 3: Healer = CLASS_DRUID; break;
                         case 4: Healer = CLASS_SHAMAN; break;
                     }
-                    std::list<HostileReference*>::const_iterator i = m_creature->getThreatManager().getThreatList().begin();
-                    for (; i != m_creature->getThreatManager().getThreatList().end(); ++i)
+                    std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin();
+                    for (; i != me->getThreatManager().getThreatList().end(); ++i)
                     {
-                        Unit* pTemp = Unit::GetUnit((*m_creature),(*i)->getUnitGuid());
+                        Unit* pTemp = Unit::GetUnit((*me),(*i)->getUnitGuid());
                         if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER && pTemp->getClass() == Healer)
                         {
                             pTarget = pTemp;
@@ -226,13 +226,13 @@ struct mob_crystal_spikeAI : public Scripted_NoMovementAI
     {
         if (SpellCrystalSpikePrevisualTimer <= diff)
         {
-            DoCast(m_creature, SPELL_CRYSTAL_SPIKE_PREVISUAL);
+            DoCast(me, SPELL_CRYSTAL_SPIKE_PREVISUAL);
             SpellCrystalSpikePrevisualTimer = 10*IN_MILISECONDS;
         } else SpellCrystalSpikePrevisualTimer -= diff;
 
         if (SpellCrystalSpikeDamageTimer <= diff)
         {
-            DoCast(m_creature, SPELL_CRYSTALL_SPIKE_DAMAGE);
+            DoCast(me, SPELL_CRYSTALL_SPIKE_DAMAGE);
             SpellCrystalSpikeDamageTimer = 10*IN_MILISECONDS;
         } else SpellCrystalSpikeDamageTimer -= diff;
     }
@@ -253,9 +253,9 @@ struct mob_crystalline_tanglerAI : public ScriptedAI
     {
         if (uiRootsTimer <= diff)
         {
-            if (m_creature->IsWithinDist(m_creature->getVictim(), 5.0f, false))
+            if (me->IsWithinDist(me->getVictim(), 5.0f, false))
             {
-                DoCast(m_creature->getVictim(), SPELL_ROOTS);
+                DoCast(me->getVictim(), SPELL_ROOTS);
                 uiRootsTimer = 15*IN_MILISECONDS;
             }
         } else uiRootsTimer -= diff;
diff --git a/src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp b/src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp
index 06267061322..8dacef04c91 100644
--- a/src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp
+++ b/src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp
@@ -30,7 +30,7 @@ struct boss_commander_stoutbeardAI : public ScriptedAI
     void Reset() {}
     void EnterCombat(Unit* who)
     {
-        DoScriptText(SAY_AGGRO, m_creature);
+        DoScriptText(SAY_AGGRO, me);
     }
     void AttackStart(Unit* who) {}
     void MoveInLineOfSight(Unit* who) {}
@@ -44,7 +44,7 @@ struct boss_commander_stoutbeardAI : public ScriptedAI
     }
     void JustDied(Unit* killer)
     {
-        DoScriptText(SAY_DEATH, m_creature);
+        DoScriptText(SAY_DEATH, me);
     }
 };
 
diff --git a/src/scripts/northrend/nexus/oculus/boss_drakos.cpp b/src/scripts/northrend/nexus/oculus/boss_drakos.cpp
index 4521782a883..f4826702b5c 100644
--- a/src/scripts/northrend/nexus/oculus/boss_drakos.cpp
+++ b/src/scripts/northrend/nexus/oculus/boss_drakos.cpp
@@ -76,7 +76,7 @@ struct boss_drakosAI : public ScriptedAI
 
     void EnterCombat(Unit* who)
     {
-        DoScriptText(SAY_AGGRO, m_creature);
+        DoScriptText(SAY_AGGRO, me);
 
         if (pInstance)
             pInstance->SetData(DATA_DRAKOS_EVENT, IN_PROGRESS);
@@ -96,11 +96,11 @@ struct boss_drakosAI : public ScriptedAI
         {
             if (bPostPull)
             {
-                m_creature->SummonCreature(NPC_UNSTABLE_SPHERE, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
-                m_creature->SummonCreature(NPC_UNSTABLE_SPHERE, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+                me->SummonCreature(NPC_UNSTABLE_SPHERE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ());
+                me->SummonCreature(NPC_UNSTABLE_SPHERE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ());
             }
             else
-                m_creature->SummonCreature(NPC_UNSTABLE_SPHERE, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+                me->SummonCreature(NPC_UNSTABLE_SPHERE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ());
             uiBombSummonTimer = 2*IN_MILISECONDS;
         } else uiBombSummonTimer -= diff;
 
@@ -121,7 +121,7 @@ struct boss_drakosAI : public ScriptedAI
             }
             else
             {
-                DoScriptText(RAND(SAY_PULL_1,SAY_PULL_2,SAY_PULL_3,SAY_PULL_4), m_creature);
+                DoScriptText(RAND(SAY_PULL_1,SAY_PULL_2,SAY_PULL_3,SAY_PULL_4), me);
                 DoCast(SPELL_MAGIC_PULL);
                 uiMagicPullTimer = 2*IN_MILISECONDS;
                 bIsPulling = true;
@@ -137,7 +137,7 @@ struct boss_drakosAI : public ScriptedAI
 
         if (uiStompTimer < diff)
         {
-            DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2,SAY_STOMP_3), m_creature);
+            DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2,SAY_STOMP_3), me);
             DoCast(SPELL_THUNDERING_STOMP);
             uiStompTimer = urand(15*IN_MILISECONDS, 18*IN_MILISECONDS);
         } else uiStompTimer -= diff ;
@@ -146,14 +146,14 @@ struct boss_drakosAI : public ScriptedAI
     }
     void JustDied(Unit* killer)
     {
-        DoScriptText(SAY_DEATH, m_creature);
+        DoScriptText(SAY_DEATH, me);
 
         if (pInstance)
             pInstance->SetData(DATA_DRAKOS_EVENT, DONE);
     }
     void KilledUnit(Unit *victim)
     {
-        DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), m_creature);
+        DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me);
     }
 };
 
@@ -171,12 +171,12 @@ struct npc_unstable_sphereAI : public ScriptedAI
 
     void Reset()
     {
-        m_creature->SetReactState(REACT_PASSIVE) ;
-        m_creature->GetMotionMaster()->MoveRandom(40.0f);
-        m_creature->SetSpeed(MOVE_RUN, 2, true);
-        m_creature->setFaction(14);
-        m_creature->AddAura(SPELL_UNSTABLE_SPHERE_PASSIVE, m_creature);
-        m_creature->AddAura(SPELL_UNSTABLE_SPHERE_TIMER, m_creature);
+        me->SetReactState(REACT_PASSIVE) ;
+        me->GetMotionMaster()->MoveRandom(40.0f);
+        me->SetSpeed(MOVE_RUN, 2, true);
+        me->setFaction(14);
+        me->AddAura(SPELL_UNSTABLE_SPHERE_PASSIVE, me);
+        me->AddAura(SPELL_UNSTABLE_SPHERE_TIMER, me);
         uiPulseTimer = 3*IN_MILISECONDS;
         uiDeathTimer = 19*IN_MILISECONDS;
     }
@@ -190,7 +190,7 @@ struct npc_unstable_sphereAI : public ScriptedAI
         } else uiPulseTimer -= diff;
 
         if (uiDeathTimer < diff)
-            m_creature->DisappearAndDie();
+            me->DisappearAndDie();
         else uiDeathTimer -= diff;
     }
 };
diff --git a/src/scripts/northrend/nexus/oculus/boss_urom.cpp b/src/scripts/northrend/nexus/oculus/boss_urom.cpp
index 6b312232bc9..0c9e85f7641 100644
--- a/src/scripts/northrend/nexus/oculus/boss_urom.cpp
+++ b/src/scripts/northrend/nexus/oculus/boss_urom.cpp
@@ -61,7 +61,7 @@ struct boss_uromAI : public ScriptedAI
     }
     void EnterCombat(Unit* who)
     {
-        DoScriptText(SAY_AGGRO, m_creature);
+        DoScriptText(SAY_AGGRO, me);
 
         if (pInstance)
             pInstance->SetData(DATA_UROM_EVENT, IN_PROGRESS);
@@ -79,16 +79,16 @@ struct boss_uromAI : public ScriptedAI
     }
     void JustDied(Unit* killer)
     {
-        DoScriptText(SAY_DEATH, m_creature);
+        DoScriptText(SAY_DEATH, me);
 
         if (pInstance)
             pInstance->SetData(DATA_UROM_EVENT, DONE);
     }
     void KilledUnit(Unit *victim)
     {
-        if (victim == m_creature)
+        if (victim == me)
             return;
-        DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), m_creature);
+        DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me);
     }
 };
 
diff --git a/src/scripts/northrend/nexus/oculus/boss_varos.cpp b/src/scripts/northrend/nexus/oculus/boss_varos.cpp
index fb640040d43..cd1132a030b 100644
--- a/src/scripts/northrend/nexus/oculus/boss_varos.cpp
+++ b/src/scripts/northrend/nexus/oculus/boss_varos.cpp
@@ -59,7 +59,7 @@ struct boss_varosAI : public ScriptedAI
     }
     void EnterCombat(Unit* who)
     {
-        DoScriptText(SAY_AGGRO, m_creature);
+        DoScriptText(SAY_AGGRO, me);
 
         if (pInstance)
             pInstance->SetData(DATA_VAROS_EVENT, IN_PROGRESS);
@@ -76,16 +76,16 @@ struct boss_varosAI : public ScriptedAI
     }
     void JustDied(Unit* killer)
     {
-        DoScriptText(SAY_DEATH, m_creature);
+        DoScriptText(SAY_DEATH, me);
 
         if (pInstance)
             pInstance->SetData(DATA_VAROS_EVENT, DONE);
     }
     void KilledUnit(Unit *victim)
     {
-        if (victim == m_creature)
+        if (victim == me)
             return;
-        DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), m_creature);
+        DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
     }
 };