Warning fixes and some random cleanup here and there

12 files changed, 121 insertions, 122 deletions

diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
index 7ef11e5256a..15c418d2919 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
@@ -126,11 +126,11 @@ public:
 
         InstanceScript* instance;
 
-        uint8  EventPhase;
+        uint8 EventPhase;
         uint32 Event_Timer;
 
-        uint8  MobSpawnId;
-        uint8  MobCount;
+        uint8 MobSpawnId;
+        uint8 MobCount;
         uint32 MobDeath_Timer;
 
         uint64 RingMobGUID[4];
@@ -142,16 +142,16 @@ public:
         {
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
 
-            EventPhase         = 0;
-            Event_Timer        = 1000;
+            EventPhase = 0;
+            Event_Timer = 1000;
 
-            MobCount           = 0;
-            MobDeath_Timer     = 0;
+            MobCount = 0;
+            MobDeath_Timer = 0;
 
             for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i)
                 RingMobGUID[i] = 0;
 
-            RingBossGUID       = 0;
+            RingBossGUID = 0;
 
             CanWalk = false;
         }
@@ -183,24 +183,24 @@ public:
             {
             case 0:
                 DoScriptText(SCRIPT_TEXT1, me);//2
-                CanWalk      = false;
-                Event_Timer  = 5000;
+                CanWalk = false;
+                Event_Timer = 5000;
                 break;
             case 1:
                 DoScriptText(SCRIPT_TEXT2, me);//4
-                CanWalk      = false;
-                Event_Timer  = 5000;
+                CanWalk = false;
+                Event_Timer = 5000;
                 break;
             case 2:
-                CanWalk      = false;
+                CanWalk = false;
                 break;
             case 3:
                 DoScriptText(SCRIPT_TEXT3, me);//5
                 break;
             case 4:
                 DoScriptText(SCRIPT_TEXT4, me);//6
-                CanWalk      = false;
-                Event_Timer  = 5000;
+                CanWalk = false;
+                Event_Timer = 5000;
                 break;
             case 5:
                 if (instance)
@@ -227,16 +227,16 @@ public:
             {
                 if (MobDeath_Timer <= diff)
                 {
-                    MobDeath_Timer           = 2500;
+                    MobDeath_Timer = 2500;
 
                     if (RingBossGUID)
                     {
                         Creature* boss = Unit::GetCreature(*me, RingBossGUID);
                         if (boss && !boss->isAlive() && boss->isDead())
                         {
-                            RingBossGUID    = 0;
-                            Event_Timer     = 5000;
-                            MobDeath_Timer  = 0;
+                            RingBossGUID = 0;
+                            Event_Timer = 5000;
+                            MobDeath_Timer = 0;
                             return;
                         }
                         return;
@@ -247,7 +247,7 @@ public:
                         Creature* mob = Unit::GetCreature(*me, RingMobGUID[i]);
                         if (mob && !mob->isAlive() && mob->isDead())
                         {
-                            RingMobGUID[i]  = 0;
+                            RingMobGUID[i] = 0;
                             --MobCount;
 
                             //seems all are gone, so set timer to continue and discontinue this
@@ -363,9 +363,9 @@ public:
 
         void Reset()
         {
-            ThunderClap_Timer       = 12000;
-            FireballVolley_Timer    = 0;
-            MightyBlow_Timer        = 15000;
+            ThunderClap_Timer = 12000;
+            FireballVolley_Timer = 0;
+            MightyBlow_Timer = 15000;
         }
 
         void UpdateAI(const uint32 diff)
@@ -426,7 +426,7 @@ class npc_kharan_mighthammer : public CreatureScript
 public:
     npc_kharan_mighthammer() : CreatureScript("npc_kharan_mighthammer") { }
 
-    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*Sender*/, uint32 action)
+    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
     {
         player->PlayerTalkClass->ClearMenus();
         switch (action)
@@ -520,7 +520,7 @@ class npc_lokhtos_darkbargainer : public CreatureScript
 public:
     npc_lokhtos_darkbargainer() : CreatureScript("npc_lokhtos_darkbargainer") { }
 
-    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*Sender*/, uint32 action)
+    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
     {
         player->PlayerTalkClass->ClearMenus();
         if (action == GOSSIP_ACTION_INFO_DEF + 1)
@@ -564,7 +564,6 @@ enum DughalQuests
     QUEST_JAIL_BREAK                      = 4322
 };
 
-// DELETE THIS IF IT IS NOT NEEDED!
 #define SAY_DUGHAL_FREE         "Thank you, $N! I'm free!!!"
 #define GOSSIP_DUGHAL           "You're free, Dughal! Get out of here!"
 
@@ -585,7 +584,7 @@ public:
         return dughal_stormwingAI;
     }
 
-    bool OnGossipSelect(Player* player, Creature* creature, uint32 Sender, uint32 action)
+    bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action)
     {
         player->PlayerTalkClass->ClearMenus();
         if (action == GOSSIP_ACTION_INFO_DEF + 1)
@@ -619,7 +618,7 @@ public:
             case 0:me->Say(SAY_DUGHAL_FREE, LANG_UNIVERSAL, PlayerGUID); break;
             case 1:instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break;
             case 2:
-                me->SetVisibility(VISIBILITY_OFF);
+                me->SetVisible(false);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED);
@@ -634,7 +633,7 @@ public:
         {
             if (IsBeingEscorted && killer == me)
             {
-                me->SetVisibility(VISIBILITY_OFF);
+                me->SetVisible(false);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED);
@@ -646,13 +645,13 @@ public:
             if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
             if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_ENDED)
             {
-                me->SetVisibility(VISIBILITY_OFF);
+                me->SetVisible(false);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             }
             else
             {
-                me->SetVisibility(VISIBILITY_ON);
+                me->SetVisible(true);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             }
@@ -767,7 +766,7 @@ public:
                 instance->SetData(DATA_GATE_SC, 0);
                 break;
             case 19:
-                me->SetVisibility(VISIBILITY_OFF);
+                me->SetVisible(false);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN, 0);
@@ -810,13 +809,13 @@ public:
                 }
             if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_SUPPLY_ROOM) == ENCOUNTER_STATE_ENDED)
             {
-                me->SetVisibility(VISIBILITY_OFF);
+                me->SetVisible(false);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             }
             else
             {
-                me->SetVisibility(VISIBILITY_ON);
+                me->SetVisible(true);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             }
@@ -1065,7 +1064,7 @@ public:
         return tobias_seecherAI;
     }
 
-    bool OnGossipSelect(Player* player, Creature* creature, uint32 Sender, uint32 action)
+    bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action)
     {
         player->PlayerTalkClass->ClearMenus();
         if (action == GOSSIP_ACTION_INFO_DEF + 1)
@@ -1099,7 +1098,7 @@ public:
         {
             if (IsBeingEscorted && killer == me)
             {
-                me->SetVisibility(VISIBILITY_OFF);
+                me->SetVisible(false);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED);
@@ -1114,7 +1113,7 @@ public:
             case 2:
                 instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break;
             case 4:
-                me->SetVisibility(VISIBILITY_OFF);
+                me->SetVisible(false);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED);
@@ -1127,13 +1126,13 @@ public:
             if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
             if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_ENDED)
             {
-                me->SetVisibility(VISIBILITY_OFF);
+                me->SetVisible(false);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             }
             else
             {
-                me->SetVisibility(VISIBILITY_ON);
+                me->SetVisible(true);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             }
@@ -1217,8 +1216,8 @@ public:
             if (HasEscortState(STATE_ESCORT_ESCORTING))
                 return;
 
-            BreakKeg_Timer    = 0;
-            BreakDoor_Timer   = 0;
+            BreakKeg_Timer = 0;
+            BreakDoor_Timer = 0;
         }
 
         void DoGo(uint32 id, uint32 state)
@@ -1263,8 +1262,8 @@ public:
                 if (BreakKeg_Timer <= diff)
                 {
                     DoGo(DATA_GO_BAR_KEG, 0);
-                    BreakKeg_Timer     = 0;
-                    BreakDoor_Timer    = 1000;
+                    BreakKeg_Timer = 0;
+                    BreakDoor_Timer = 1000;
                 } else BreakKeg_Timer -= diff;
             }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
index 2e8dc029d44..ff0f1a4cedd 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
@@ -42,8 +42,8 @@ public:
 
         void Reset()
         {
-            FireBlast_Timer    = 2000;
-            Spirit_Timer       = 24000;
+            FireBlast_Timer = 2000;
+            Spirit_Timer = 24000;
         }
 
         void EnterCombat(Unit* /*who*/) {}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
index b4a4c416693..2585796e28e 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
@@ -49,11 +49,11 @@ public:
 
         void Reset()
         {
-            ShadowBolt_Timer           = 7000;
-            CurseOfTongues_Timer       = 24000;
-            CurseOfWeakness_Timer      = 12000;
-            DemonArmor_Timer           = 3000;
-            EnvelopingWeb_Timer        = 16000;
+            ShadowBolt_Timer = 7000;
+            CurseOfTongues_Timer = 24000;
+            CurseOfWeakness_Timer = 12000;
+            DemonArmor_Timer = 3000;
+            EnvelopingWeb_Timer = 16000;
         }
 
         void EnterCombat(Unit* /*who*/) {}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
index e894fd35bd1..fea8657496b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
@@ -55,9 +55,9 @@ public:
 
         void Reset()
         {
-            HandOfThaurissan_Timer   = 4000;
-            AvatarOfFlame_Timer      = 25000;
-            //Counter                = 0;
+            HandOfThaurissan_Timer = 4000;
+            AvatarOfFlame_Timer = 25000;
+            //Counter= 0;
         }
 
         void EnterCombat(Unit* /*who*/)
@@ -100,7 +100,7 @@ public:
                 //else
                 //{
                     HandOfThaurissan_Timer = 5000;
-                    //Counter              = 0;
+                    //Counter = 0;
                 //}
             } else HandOfThaurissan_Timer -= diff;
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
index 69808386423..703f684cc9f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
@@ -47,11 +47,11 @@ public:
 
         void Reset()
         {
-            MightyBlow_Timer   = 8000;
-            HamString_Timer    = 12000;
-            Cleave_Timer       = 16000;
-            Adds_Timer         = 0;
-            Medics             = false;
+            MightyBlow_Timer = 8000;
+            HamString_Timer = 12000;
+            Cleave_Timer = 16000;
+            Adds_Timer = 0;
+            Medics = false;
         }
 
         void EnterCombat(Unit* /*who*/) {}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
index 883c601709e..b2c93d949c2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
@@ -43,8 +43,8 @@ public:
 
         void Reset()
         {
-            WhirlWind_Timer     = 12000;
-            MortalStrike_Timer  = 22000;
+            WhirlWind_Timer = 12000;
+            MortalStrike_Timer = 22000;
         }
 
         void EnterCombat(Unit* /*who*/)
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
index 7686ece3c2e..63d945ade90 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
@@ -43,8 +43,8 @@ public:
 
         void Reset()
         {
-            GroundTremor_Timer   = 12000;
-            Frenzy_Timer         = 0;
+            GroundTremor_Timer = 12000;
+            Frenzy_Timer =0;
         }
 
         void EnterCombat(Unit* /*who*/) {}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
index 26e2bc80eb2..f4f245be4be 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
@@ -47,10 +47,10 @@ public:
 
         void Reset()
         {
-            ShadowWordPain_Timer     = 4000;
-            ManaBurn_Timer           = 14000;
-            PsychicScream_Timer      = 32000;
-            ShadowShield_Timer       = 8000;
+            ShadowWordPain_Timer = 4000;
+            ManaBurn_Timer = 14000;
+            PsychicScream_Timer = 32000;
+            ShadowShield_Timer = 8000;
         }
 
         void EnterCombat(Unit* /*who*/) {}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
index 141b8307b7b..52d78487776 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
@@ -48,8 +48,8 @@ public:
 
         void Reset()
         {
-            FieryBurst_Timer    = 5000;
-            WarStomp_Timer      = 0;
+            FieryBurst_Timer = 5000;
+            WarStomp_Timer =0;
         }
 
         void EnterCombat(Unit* /*who*/) {}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
index 72a60daea2d..e6f65ab4252 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
@@ -49,10 +49,10 @@ public:
 
         void Reset()
         {
-            Heal_Timer            = 12000;                 // These times are probably wrong
-            MindBlast_Timer       = 16000;
-            ShadowWordPain_Timer  = 2000;
-            Smite_Timer           = 8000;
+            Heal_Timer = 12000;                                 //These times are probably wrong
+            MindBlast_Timer = 16000;
+            ShadowWordPain_Timer = 2000;
+            Smite_Timer = 8000;
         }
 
         void EnterCombat(Unit* /*who*/) {}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
index 3c8d5fc4fa8..de520fa8a58 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
@@ -45,7 +45,7 @@ class boss_gloomrel : public CreatureScript
 public:
     boss_gloomrel() : CreatureScript("boss_gloomrel") { }
 
-    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*Sender*/, uint32 action)
+    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
     {
         player->PlayerTalkClass->ClearMenus();
         switch (action)
@@ -104,7 +104,7 @@ class boss_doomrel : public CreatureScript
 public:
     boss_doomrel() : CreatureScript("boss_doomrel") { }
 
-    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*Sender*/, uint32 action)
+    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
     {
         player->PlayerTalkClass->ClearMenus();
         switch (action)
@@ -156,11 +156,11 @@ public:
 
         void Reset()
         {
-            ShadowVolley_Timer      = 10000;
-            Immolate_Timer          = 18000;
-            CurseOfWeakness_Timer   = 5000;
-            DemonArmor_Timer        = 16000;
-            Voidwalkers             = false;
+            ShadowVolley_Timer = 10000;
+            Immolate_Timer = 18000;
+            CurseOfWeakness_Timer = 5000;
+            DemonArmor_Timer = 16000;
+            Voidwalkers = false;
 
             me->setFaction(FACTION_FRIEND);
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
index 2ef3ef48ecb..03cb077936b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
@@ -115,57 +115,57 @@ public:
         {
             memset(&encounter, 0, sizeof(encounter));
 
-            EmperorGUID                 = 0;
-            PhalanxGUID                 = 0;
-            MagmusGUID                  = 0;
-            MoiraGUID                   = 0;
-
-            GoArena1GUID                = 0;
-            GoArena2GUID                = 0;
-            GoArena3GUID                = 0;
-            GoArena4GUID                = 0;
-            GoShadowLockGUID            = 0;
-            GoShadowMechGUID            = 0;
-            GoShadowGiantGUID           = 0;
-            GoShadowDummyGUID           = 0;
-            GoBarKegGUID                = 0;
-            GoBarKegTrapGUID            = 0;
-            GoBarDoorGUID               = 0;
-            GoTombEnterGUID             = 0;
-            GoTombExitGUID              = 0;
-            GoLyceumGUID                = 0;
-            GoSFSGUID                   = 0;
-            GoSFNGUID                   = 0;
-            GoGolemNGUID                = 0;
-            GoGolemSGUID                = 0;
-            GoThroneGUID                = 0;
-            GoChestGUID                 = 0;
-            GoSpectralChaliceGUID       = 0;
-
-            BarAleCount                 = 0;
-            GhostKillCount              = 0;
-            TombEventStarterGUID        = 0;
+            EmperorGUID = 0;
+            PhalanxGUID = 0;
+            MagmusGUID = 0;
+            MoiraGUID = 0;
+
+            GoArena1GUID = 0;
+            GoArena2GUID = 0;
+            GoArena3GUID = 0;
+            GoArena4GUID = 0;
+            GoShadowLockGUID = 0;
+            GoShadowMechGUID = 0;
+            GoShadowGiantGUID = 0;
+            GoShadowDummyGUID = 0;
+            GoBarKegGUID = 0;
+            GoBarKegTrapGUID = 0;
+            GoBarDoorGUID = 0;
+            GoTombEnterGUID = 0;
+            GoTombExitGUID = 0;
+            GoLyceumGUID = 0;
+            GoSFSGUID = 0;
+            GoSFNGUID = 0;
+            GoGolemNGUID = 0;
+            GoGolemSGUID = 0;
+            GoThroneGUID = 0;
+            GoChestGUID = 0;
+            GoSpectralChaliceGUID = 0;
+
+            BarAleCount = 0;
+            GhostKillCount = 0;
+            TombEventStarterGUID = 0;
             TombTimer = TIMER_TOMBOFTHESEVEN;
-            TombEventCounter            = 0;
+            TombEventCounter = 0;
 
             for (uint8 i = 0; i < 7; ++i)
-                TombBossGUIDs[i]        = 0;
+                TombBossGUIDs[i] = 0;
         }
 
         void OnCreatureCreate(Creature* creature)
         {
             switch (creature->GetEntry())
             {
-            case NPC_EMPEROR:  EmperorGUID       = creature->GetGUID(); break;
-            case NPC_PHALANX:  PhalanxGUID       = creature->GetGUID(); break;
-            case NPC_MOIRA:    MoiraGUID         = creature->GetGUID(); break;
-            case NPC_DOOMREL:  TombBossGUIDs[0]  = creature->GetGUID(); break;
-            case NPC_DOPEREL:  TombBossGUIDs[1]  = creature->GetGUID(); break;
-            case NPC_HATEREL:  TombBossGUIDs[2]  = creature->GetGUID(); break;
-            case NPC_VILEREL:  TombBossGUIDs[3]  = creature->GetGUID(); break;
-            case NPC_SEETHREL: TombBossGUIDs[4]  = creature->GetGUID(); break;
-            case NPC_GLOOMREL: TombBossGUIDs[5]  = creature->GetGUID(); break;
-            case NPC_ANGERREL: TombBossGUIDs[6]  = creature->GetGUID(); break;
+            case NPC_EMPEROR: EmperorGUID = creature->GetGUID(); break;
+            case NPC_PHALANX: PhalanxGUID = creature->GetGUID(); break;
+            case NPC_MOIRA: MoiraGUID = creature->GetGUID(); break;
+            case NPC_DOOMREL: TombBossGUIDs[0] = creature->GetGUID(); break;
+            case NPC_DOPEREL: TombBossGUIDs[1] = creature->GetGUID(); break;
+            case NPC_HATEREL: TombBossGUIDs[2] = creature->GetGUID(); break;
+            case NPC_VILEREL: TombBossGUIDs[3] = creature->GetGUID(); break;
+            case NPC_SEETHREL: TombBossGUIDs[4] = creature->GetGUID(); break;
+            case NPC_GLOOMREL: TombBossGUIDs[5] = creature->GetGUID(); break;
+            case NPC_ANGERREL: TombBossGUIDs[6] = creature->GetGUID(); break;
             case NPC_MAGMUS:
                 MagmusGUID = creature->GetGUID();
                 if (!creature->isAlive())