Cosmetic: Multiple cosmetic changes

- Added missing space to 'if', 'for', 'while' and 'switch' when it's followed by '('
- Added missing space after a comma and remove space before comma (with some exceptions)
- Remove trailing spaces
- Convert tab to spaces

Note: Only affects files with extension "cpp" and "h" under /src/server

35 files changed, 111 insertions, 111 deletions

diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
index adafc78f33f..7823e84f29a 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
@@ -204,7 +204,7 @@ public:
     bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction)
     {
         player->PlayerTalkClass->ClearMenus();
-        switch(uiAction)
+        switch (uiAction)
         {
             case GOSSIP_ACTION_INFO_DEF+1:
                 player->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f);
@@ -238,7 +238,7 @@ public:
 
         void WaypointReached(uint32 uiPoint)
         {
-            switch(uiPoint)
+            switch (uiPoint)
             {
                 case 4:
                     SetEscortPaused(true);
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
index 07c7fcf6f27..cf79dfee77d 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
@@ -109,7 +109,7 @@ public:
 
         void OnGameObjectCreate(GameObject* go)
         {
-            switch(go->GetEntry())
+            switch (go->GetEntry())
             {
                 case GO_FIRE_OF_AKU_MAI_1:
                     m_uiShrine1GUID = go->GetGUID();
@@ -143,7 +143,7 @@ public:
 
         void SetData(uint32 uiType, uint32 uiData)
         {
-            switch(uiType)
+            switch (uiType)
             {
                 case TYPE_GELIHAST:
                     m_auiEncounter[0] = uiData;
@@ -213,7 +213,7 @@ public:
 
         uint32 GetData(uint32 uiType)
         {
-            switch(uiType)
+            switch (uiType)
             {
                 case TYPE_GELIHAST:
                     return m_auiEncounter[0];
@@ -234,7 +234,7 @@ public:
 
         uint64 GetData64(uint32 uiData)
         {
-            switch(uiData)
+            switch (uiData)
             {
                 case DATA_TWILIGHT_LORD_KELRIS:
                     return m_uiTwilightLordKelrisGUID;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index 5a28f3af333..a7e5f51da98 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -311,7 +311,7 @@ public:
 
         void GainSoulCharge(Player* victim)
         {
-            switch(victim->getClass())
+            switch (victim->getClass())
             {
                 case CLASS_PRIEST:
                 case CLASS_PALADIN:
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
index ef3b2b77406..f681b245a42 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
@@ -54,7 +54,7 @@ public:
     {
         player->PlayerTalkClass->ClearMenus();
         hyjalAI* ai = CAST_AI(hyjalAI, creature->AI());
-        switch(uiAction)
+        switch (uiAction)
         {
             case GOSSIP_ACTION_INFO_DEF + 1:
                 ai->StartEvent(player);
@@ -131,7 +131,7 @@ public:
         player->PlayerTalkClass->ClearMenus();
         hyjalAI* ai = CAST_AI(hyjalAI, creature->AI());
         ai->DeSpawnVeins();//despawn the alliance veins
-        switch(uiAction)
+        switch (uiAction)
         {
             case GOSSIP_ACTION_INFO_DEF + 1:
                 ai->StartEvent(player);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index 1d1b1902188..0754e4a1554 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -361,7 +361,7 @@ void hyjalAI::Reset()
     EnemyCount = 0;
 
     // Set faction properly based on Creature entry
-    switch(me->GetEntry())
+    switch (me->GetEntry())
     {
         case JAINA:
             Faction = 0;
@@ -450,7 +450,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
         SpawnLoc[i] = Base[random][i];
     }
     Creature* creature = NULL;
-    switch(entry)
+    switch (entry)
     {
             case 17906:    //GARGOYLE
 
@@ -463,7 +463,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
                     creature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_GARG_GATE][0]+irand(-10, 10), SpawnPointSpecial[SPAWN_GARG_GATE][1]+irand(-10, 10), SpawnPointSpecial[SPAWN_GARG_GATE][2]+irand(-10, 10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000);
                 }
                 break;
-            case 17907:    //FROST_WYRM ,
+            case 17907:    //FROST_WYRM,
                 if (FirstBossDead && WaveCount == 1) //summon at gate
                     creature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_WYRM_GATE][0], SpawnPointSpecial[SPAWN_WYRM_GATE][1], SpawnPointSpecial[SPAWN_WYRM_GATE][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000);
                 else
@@ -492,7 +492,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
 
         creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
         creature->setActive(true);
-        switch(entry)
+        switch (entry)
         {
             case NECROMANCER:
             case ABOMINATION:
@@ -751,7 +751,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
     if (DoHide)
     {
         DoHide = false;
-        switch(me->GetEntry())
+        switch (me->GetEntry())
         {
             case JAINA:
                 if (pInstance && pInstance->GetData(DATA_ALLIANCE_RETREAT))
@@ -810,7 +810,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
             IsDummy = true;
             bRetreat = false;
             HideNearPos(me->GetPositionX(), me->GetPositionY());
-            switch(me->GetEntry())
+            switch (me->GetEntry())
             {
                 case JAINA://jaina
                     HideNearPos(5037.76f, -1889.71f);
@@ -892,7 +892,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
 
                 Unit* target = NULL;
 
-                switch(Spells[i].TargetType)
+                switch (Spells[i].TargetType)
                 {
                     case TARGETTYPE_SELF: target = me; break;
                     case TARGETTYPE_RANDOM: target = SelectTarget(SELECT_TARGET_RANDOM, 0); break;
@@ -1071,7 +1071,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
     if (!Teleported)
         return;
     Overrun = false;//execute once
-    switch(faction)
+    switch (faction)
     {
         case 0://alliance
             for (uint8 i = 0; i < 92; ++i)//summon fires
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
index 6a7e6f71003..8ca0ba5efd2 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
@@ -197,7 +197,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/)
             {
                 for (uint8 i = 0; i < 4; ++i)
                     AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]);
-                switch(OverrunType)
+                switch (OverrunType)
                 {
                     case 0:
                         AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3, 3), AllianceOverrunWP[22][1]+irand(-3, 3), AllianceOverrunWP[22][2]);
@@ -257,7 +257,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/)
             {
                 for (uint8 i = 0; i < 4; ++i)
                     AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]);
-                switch(OverrunType)
+                switch (OverrunType)
                 {
                     case 0:
                         AddWaypoint(4, AllianceOverrunWP[1][0]+irand(-3, 3), AllianceOverrunWP[1][1]+irand(-3, 3), AllianceOverrunWP[1][2]);
@@ -332,7 +332,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/)
             {
                 for (uint8 i = 0; i < 6; ++i)
                     AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]);
-                switch(OverrunType)
+                switch (OverrunType)
                 {
                     case 0:
                         AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10, 10), HordeOverrunWP[16][1]+irand(-10, 10), HordeOverrunWP[16][2]);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 282b0192f57..fcb7126cb6a 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -117,7 +117,7 @@ public:
 
         void OnGameObjectCreate(GameObject* go)
         {
-            switch(go->GetEntry())
+            switch (go->GetEntry())
             {
                 case 182060:
                     HordeGate = go->GetGUID();
@@ -141,7 +141,7 @@ public:
 
         void OnCreatureCreate(Creature* creature)
         {
-            switch(creature->GetEntry())
+            switch (creature->GetEntry())
             {
                 case 17767: RageWinterchill = creature->GetGUID(); break;
                 case 17808: Anetheron = creature->GetGUID(); break;
@@ -156,7 +156,7 @@ public:
 
         uint64 GetData64(uint32 identifier)
         {
-            switch(identifier)
+            switch (identifier)
             {
                 case DATA_RAGEWINTERCHILL: return RageWinterchill;
                 case DATA_ANETHERON: return Anetheron;
@@ -173,7 +173,7 @@ public:
 
         void SetData(uint32 type, uint32 data)
         {
-            switch(type)
+            switch (type)
             {
                 case DATA_RAGEWINTERCHILLEVENT: m_auiEncounter[0] = data; break;
                 case DATA_ANETHERONEVENT:
@@ -282,7 +282,7 @@ public:
 
         uint32 GetData(uint32 type)
         {
-            switch(type)
+            switch (type)
             {
                 case DATA_RAGEWINTERCHILLEVENT: return m_auiEncounter[0];
                 case DATA_ANETHERONEVENT:      return m_auiEncounter[1];
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
index f557354192a..3912ef90c9c 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
@@ -126,7 +126,7 @@ public:
 
         void UpdateAI(const uint32 diff)
         {
-            switch(Phase)
+            switch (Phase)
             {
                 case COMBAT:
                     //Return since we have no target
@@ -195,7 +195,7 @@ public:
                 case OUTRO:
                     if (uiOutroTimer < diff)
                     {
-                        switch(uiOutroStep)
+                        switch (uiOutroStep)
                         {
                             case 1:
                                 DoScriptText(SAY_ESCAPE_SPEECH_1, me);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
index 678a38ffeca..3aee0ba30d0 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
@@ -377,7 +377,7 @@ public:
 
             if (pInstance) {
                 pInstance->SetData(DATA_ARTHAS_EVENT, NOT_STARTED);
-                switch(pInstance->GetData(DATA_ARTHAS_EVENT))
+                switch (pInstance->GetData(DATA_ARTHAS_EVENT))
                 {
                     case NOT_STARTED:
                         bStepping = true;
@@ -448,7 +448,7 @@ public:
 
         void WaypointReached(uint32 uiPointId)
         {
-            switch(uiPointId)
+            switch (uiPointId)
             {
                 case 0:
                 case 1:
@@ -575,7 +575,7 @@ public:
             {
                 if (uiPhaseTimer <= diff)
                 {
-                    switch(uiStep)
+                    switch (uiStep)
                     {
                         //After reset
                         case 0:
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
index 1837dd33949..46eef1d8bb4 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
@@ -149,7 +149,7 @@ public:
 
         uint8 GetRiftWaveId()
         {
-            switch(mRiftPortalCount)
+            switch (mRiftPortalCount)
             {
             case 6:
                 mRiftWaveId = 2;
@@ -166,7 +166,7 @@ public:
 
         void SetData(uint32 type, uint32 data)
         {
-            switch(type)
+            switch (type)
             {
             case TYPE_MEDIVH:
                 if (data == SPECIAL && m_auiEncounter[0] == IN_PROGRESS)
@@ -237,7 +237,7 @@ public:
 
         uint32 GetData(uint32 type)
         {
-            switch(type)
+            switch (type)
             {
             case TYPE_MEDIVH:
                 return m_auiEncounter[0];
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
index 28f5477fe80..115fa1ededb 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -103,7 +103,7 @@ public:
 
         void OnCreatureCreate(Creature* creature)
         {
-            switch(creature->GetEntry())
+            switch (creature->GetEntry())
             {
                 case THRALL_ENTRY:
                     ThrallGUID = creature->GetGUID();
@@ -127,7 +127,7 @@ public:
                 return;
             }
 
-            switch(type)
+            switch (type)
             {
                 case TYPE_BARREL_DIVERSION:
                 {
@@ -202,7 +202,7 @@ public:
 
         uint32 GetData(uint32 data)
         {
-            switch(data)
+            switch (data)
             {
                 case TYPE_BARREL_DIVERSION:
                     return m_auiEncounter[0];
@@ -222,7 +222,7 @@ public:
 
         uint64 GetData64(uint32 data)
         {
-            switch(data)
+            switch (data)
             {
                 case DATA_THRALL:
                     return ThrallGUID;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
index 485c52d0423..4f49c08f16a 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -202,7 +202,7 @@ public:
     {
         player->PlayerTalkClass->ClearMenus();
         InstanceScript* pInstance = creature->GetInstanceScript();
-        switch(uiAction)
+        switch (uiAction)
         {
             case GOSSIP_ACTION_INFO_DEF+1:
                 player->CLOSE_GOSSIP_MENU();
@@ -301,7 +301,7 @@ public:
             if (!pInstance)
                 return;
 
-            switch(i)
+            switch (i)
             {
                 case 8:
                     SetRun(false);
@@ -513,7 +513,7 @@ public:
 
         void JustSummoned(Creature* summoned)
         {
-             switch(summoned->GetEntry())
+             switch (summoned->GetEntry())
              {
             //TODO: make Scarloc start into event instead, and not start attack directly
              case MOB_ENTRY_BARN_GUARDSMAN:
@@ -633,7 +633,7 @@ public:
 
         void WaypointReached(uint32 i)
         {
-            switch(i)
+            switch (i)
             {
                 case 6:
                     DoScriptText(SAY_TA_FREE, me);
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
index 84923d3def5..1c69e72befe 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
@@ -85,7 +85,7 @@ public:
                 return;
             }
 
-            switch(go->GetEntry())
+            switch (go->GetEntry())
             {
                 case GO_WHELP_SPAWNER:
                     Position goPos;
@@ -141,7 +141,7 @@ public:
 
         void SetData(uint32 uiType, uint32 uiData)
         {
-            switch(uiType)
+            switch (uiType)
             {
                 case DATA_ONYXIA:
                     m_auiEncounter[0] = uiData;
@@ -174,7 +174,7 @@ public:
 
         void SetData64(uint32 uiType, uint64 uiData)
         {
-            switch(uiType)
+            switch (uiType)
             {
                 case DATA_FLOOR_ERUPTION_GUID:
                     FloorEruptionGUID[1] = FloorEruptionGUID[0];
@@ -186,7 +186,7 @@ public:
 
         uint32 GetData(uint32 uiType)
         {
-            switch(uiType)
+            switch (uiType)
             {
                 case DATA_ONYXIA:
                     return m_auiEncounter[0];
@@ -197,7 +197,7 @@ public:
 
         uint64 GetData64(uint32 uiData)
         {
-            switch(uiData)
+            switch (uiData)
             {
                 case DATA_ONYXIA_GUID:
                     return m_uiOnyxiasGUID;
@@ -238,7 +238,7 @@ public:
 
         bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0)
         {
-            switch(criteria_id)
+            switch (criteria_id)
             {
                 case ACHIEV_CRITERIA_MANY_WHELPS_10_PLAYER:  // Criteria for achievement 4403: Many Whelps! Handle It! (10 player) Hatch 50 eggs in 10s
                 case ACHIEV_CRITERIA_MANY_WHELPS_25_PLAYER:  // Criteria for achievement 4406: Many Whelps! Handle It! (25 player) Hatch 50 eggs in 10s
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
index 19287d656a8..0082839e38f 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
@@ -100,7 +100,7 @@ public:
 
         void OnGameObjectCreate(GameObject* go)
         {
-            switch(go->GetEntry())
+            switch (go->GetEntry())
             {
                 case GO_GONG:
                     uiGongGUID = go->GetGUID();
@@ -118,7 +118,7 @@ public:
             {
                 uiGongWaves = uiData;
 
-                switch(uiGongWaves)
+                switch (uiGongWaves)
                 {
                     case 9:
                     case 14:
@@ -139,7 +139,7 @@ public:
                         uint32 uiCreature = 0;
                         uint8 uiSummonTimes = 0;
 
-                        switch(uiGongWaves)
+                        switch (uiGongWaves)
                         {
                             case 1:
                                 uiCreature = CREATURE_TOMB_FIEND;
@@ -186,7 +186,7 @@ public:
 
         uint32 GetData(uint32 uiType)
         {
-            switch(uiType)
+            switch (uiType)
             {
                 case DATA_GONG_WAVES:
                     return uiGongWaves;
@@ -197,7 +197,7 @@ public:
 
         uint64 GetData64(uint32 uiType)
         {
-            switch(uiType)
+            switch (uiType)
             {
                 case DATA_GONG: return uiGongGUID;
             }
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
index a251e6dfdf3..568bf355d06 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -69,7 +69,7 @@ public:
 
         void OnGameObjectCreate(GameObject* go)
         {
-            switch(go->GetEntry())
+            switch (go->GetEntry())
             {
                 case 21099: DoorWardGUID = go->GetGUID(); break;
             }
@@ -78,7 +78,7 @@ public:
         void Update(uint32 /*diff*/)
         {
             if (WardKeeperDeath == WARD_KEEPERS_NR)
-                if(GameObject* pGo = instance->GetGameObject(DoorWardGUID))
+                if (GameObject* pGo = instance->GetGameObject(DoorWardGUID))
                 {
                     pGo->SetUInt32Value(GAMEOBJECT_FLAGS, 33);
                     pGo->SetGoState(GO_STATE_ACTIVE);
@@ -87,7 +87,7 @@ public:
 
         void SetData(uint32 type, uint32 /*data*/)
         {
-            switch(type)
+            switch (type)
             {
                 case EVENT_WARD_KEEPER: WardKeeperDeath++; break;
             }
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
index 697083aa4e7..7b084a3b5fc 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
@@ -54,7 +54,7 @@ class boss_kurinnaxx : public CreatureScript
                 _Reset();
                 _enraged = false;
                 events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000);
-                events.ScheduleEvent(EVENT_SANDTRAP, urand(5000,15000));
+                events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000));
                 events.ScheduleEvent(EVENT_TRASH, 1000);
                 events.ScheduleEvent(EVENT_WIDE_SLASH, 11000);
             }
@@ -91,7 +91,7 @@ class boss_kurinnaxx : public CreatureScript
                                 target->CastSpell(target, SPELL_SANDTRAP, true);
                             else if (Unit* victim = me->getVictim())
                                 victim->CastSpell(victim, SPELL_SANDTRAP, true);
-                            events.ScheduleEvent(EVENT_SANDTRAP, urand(5000,15000));
+                            events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000));
                             break;
                         case EVENT_WIDE_SLASH:
                             DoCast(me, SPELL_WIDE_SLASH);
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
index 8afdc29b76e..030da10e515 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
@@ -152,7 +152,7 @@ class boss_moam : public CreatureScript
                             for (std::list<Unit*>::iterator itr = targetList.begin(); itr != targetList.end(); ++itr)
                                 DoCast(*itr, SPELL_DRAIN_MANA);
 
-                            events.ScheduleEvent(EVENT_DRAIN_MANA, urand(5000,15000));
+                            events.ScheduleEvent(EVENT_DRAIN_MANA, urand(5000, 15000));
                             break;
                         }/*
                         case EVENT_WIDE_SLASH:
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index 1a939123779..c73843b7a8c 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -592,7 +592,7 @@ public:
 
             //Get random but only if we have more than one unit on threat list
             if (temp.size() > 1)
-                advance (j , rand() % (temp.size() - 1));
+                advance (j, rand() % (temp.size() - 1));
 
             return (*j);
         }
@@ -916,7 +916,7 @@ public:
 
         void DoAction(const int32 param)
         {
-            switch(param)
+            switch (param)
             {
                 case ACTION_FLESH_TENTACLE_KILLED:
                     ++FleshTentaclesKilled;
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
index 8a40096bc33..9d83bfea866 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
@@ -145,7 +145,7 @@ public:
                         if (DoGetThreat(target))
                             DoModifyThreatPercent(target, -100);
 
-                        switch(urand(0, 2))
+                        switch (urand(0, 2))
                         {
                             case 0:
                                 DoTeleportPlayer(target, -8106.0142f, 1289.2900f, -74.419533f, 5.112f);
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
index a4d204014da..6a29dab356c 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
@@ -91,7 +91,7 @@ public:
 
         uint32 GetData(uint32 type)
         {
-            switch(type)
+            switch (type)
             {
                 case DATA_VEMISDEAD:
                     if (IsBossDied[0])
@@ -119,7 +119,7 @@ public:
 
         uint64 GetData64 (uint32 identifier)
         {
-            switch(identifier)
+            switch (identifier)
             {
                 case DATA_SKERAM:
                     return SkeramGUID;
@@ -137,7 +137,7 @@ public:
 
         void SetData(uint32 type, uint32 data)
         {
-            switch(type)
+            switch (type)
             {
                 case DATA_VEM_DEATH:
                     IsBossDied[0] = true;
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
index 22973967052..8b4b1df4420 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
@@ -158,7 +158,7 @@ public:
 
         void OnGameObjectCreate(GameObject* go)
         {
-            switch(go->GetEntry())
+            switch (go->GetEntry())
             {
                 case GO_END_DOOR:
                     EndDoorGUID = go->GetGUID();
@@ -168,7 +168,7 @@ public:
 
         uint32 GetData(uint32 type)
         {
-            switch(type)
+            switch (type)
             {
                 case EVENT_PYRAMID:
                     return PyramidPhase;
@@ -178,7 +178,7 @@ public:
 
         uint64 GetData64(uint32 data)
         {
-            switch(data)
+            switch (data)
             {
                 case ENTRY_ZUMRAH:
                     return ZumrahGUID;
@@ -200,7 +200,7 @@ public:
 
         void SetData(uint32 type, uint32 data)
         {
-            switch(type)
+            switch (type)
             {
                 case EVENT_PYRAMID:
                     PyramidPhase=data;
@@ -322,7 +322,7 @@ public:
         }
 
         bool IsWaveAllDead(){
-            for(std::list<uint64>::iterator itr = addsAtBase.begin(); itr != addsAtBase.end(); ++itr)
+            for (std::list<uint64>::iterator itr = addsAtBase.begin(); itr != addsAtBase.end(); ++itr)
             {
                 if (Creature* add = instance->GetCreature((*itr)))
                 {
@@ -330,7 +330,7 @@ public:
                         return false;
                 }
             }
-            for(std::list<uint64>::iterator itr = movedadds.begin(); itr != movedadds.end(); ++itr)
+            for (std::list<uint64>::iterator itr = movedadds.begin(); itr != movedadds.end(); ++itr)
             {
                 if (Creature* add = instance->GetCreature(((*itr))))
                 {
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
index 375e586f13b..f634d593f44 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
@@ -24,7 +24,7 @@ enum zfPyramidPhases
 {
     PYRAMID_NOT_STARTED, //default
     PYRAMID_CAGES_OPEN, //happens in GO hello for cages
-    PYRAMID_ARRIVED_AT_STAIR , //happens in Weegli's movementinform
+    PYRAMID_ARRIVED_AT_STAIR, //happens in Weegli's movementinform
     PYRAMID_WAVE_1,
     PYRAMID_PRE_WAVE_2,
     PYRAMID_WAVE_2,
diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp
index 527d6b3d3e4..58432eb9e01 100644
--- a/src/server/scripts/Kalimdor/ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/ashenvale.cpp
@@ -186,7 +186,7 @@ class npc_ruul_snowhoof : public CreatureScript
                 if (!player)
                     return;
 
-                switch(i)
+                switch (i)
                 {
                 case 0:    {
                         me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
@@ -319,7 +319,7 @@ class npc_muglash : public CreatureScript
             {
                 Player* player = GetPlayerForEscort();
 
-                switch(i)
+                switch (i)
                 {
                     case 0:
                         if (player)
@@ -382,7 +382,7 @@ class npc_muglash : public CreatureScript
 
             void DoWaveSummon()
             {
-                switch(m_uiWaveId)
+                switch (m_uiWaveId)
                 {
                     case 1:
                         me->SummonCreature(NPC_WRATH_RIDER,     m_afFirstNagaCoord[0][0], m_afFirstNagaCoord[0][1], m_afFirstNagaCoord[0][2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
index e043f9e05b4..b572d132c26 100644
--- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
@@ -376,7 +376,7 @@ public:
             if (!player)
                 return;
 
-            switch(i)
+            switch (i)
             {
             case 0:
                 DoScriptText(SAY_START, me, player);
@@ -479,7 +479,7 @@ public:
         {
             Creature* Spark = Unit::GetCreature(*me, SparkGUID);
 
-            switch(Step)
+            switch (Step)
             {
             case 0:
                 if (Spark)
diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp
index 3242797d3e7..01325d5bfff 100644
--- a/src/server/scripts/Kalimdor/darkshore.cpp
+++ b/src/server/scripts/Kalimdor/darkshore.cpp
@@ -238,7 +238,7 @@ public:
             if (!player)
                 return;
 
-            switch(i)
+            switch (i)
             {
                 case 0:
                     DoScriptText(SAY_REM_START, me, player);
diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
index f0f27db8095..120f17c1cb6 100644
--- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
@@ -299,7 +299,7 @@ public:
 
             if (bYellTimer && uiYellTimer <= uiDiff)
             {
-                switch(uiStep)
+                switch (uiStep)
                 {
                     case 0:
                         DoScriptText(RAND(SAY_QUEST2, SAY_QUEST3, SAY_QUEST4, SAY_QUEST5, SAY_QUEST6), me);
diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp
index 822ac41f1c9..98e1130d3f7 100644
--- a/src/server/scripts/Kalimdor/feralas.cpp
+++ b/src/server/scripts/Kalimdor/feralas.cpp
@@ -146,9 +146,9 @@ public:
                 case 30:
                     DoScriptText(SAY_OOX_AMBUSH, me);
                     me->SummonCreature(NPC_WOODPAW_REAVER, -4425.14f, 2075.87f, 47.77f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
-                    me->SummonCreature(NPC_WOODPAW_BRUTE , -4426.68f, 2077.98f, 47.57f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                    me->SummonCreature(NPC_WOODPAW_BRUTE, -4426.68f, 2077.98f, 47.57f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
                     me->SummonCreature(NPC_WOODPAW_MYSTIC, -4428.33f, 2080.24f, 47.43f, 3.87f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
-                    me->SummonCreature(NPC_WOODPAW_ALPHA , -4430.04f, 2075.54f, 46.83f, 3.81f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                    me->SummonCreature(NPC_WOODPAW_ALPHA, -4430.04f, 2075.54f, 46.83f, 3.81f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
                     break;
                 case 37:
                     DoScriptText(SAY_OOX_END, me);
diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp
index a714f8716ae..b8b8b31ba2c 100644
--- a/src/server/scripts/Kalimdor/moonglade.cpp
+++ b/src/server/scripts/Kalimdor/moonglade.cpp
@@ -57,7 +57,7 @@ public:
     bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
     {
         player->PlayerTalkClass->ClearMenus();
-        switch(uiAction)
+        switch (uiAction)
         {
             case GOSSIP_ACTION_INFO_DEF + 1:
                 player->CLOSE_GOSSIP_MENU();
@@ -172,7 +172,7 @@ public:
     bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
     {
         player->PlayerTalkClass->ClearMenus();
-        switch(uiAction)
+        switch (uiAction)
         {
             case GOSSIP_ACTION_INFO_DEF + 1:
                 player->CLOSE_GOSSIP_MENU();
@@ -348,7 +348,7 @@ public:
         void EnterCombat(Unit* who)
         {
             uint32 rnd = rand()%2;
-            switch(rnd)
+            switch (rnd)
             {
                 case 0: DoScriptText(CLINTAR_SPIRIT_SAY_UNDER_ATTACK_1, me, who); break;
                 case 1: DoScriptText(CLINTAR_SPIRIT_SAY_UNDER_ATTACK_2, me, who); break;
@@ -402,10 +402,10 @@ public:
                     return;
                 }
 
-                switch(CurrWP)
+                switch (CurrWP)
                 {
                     case 0:
-                        switch(Step)
+                        switch (Step)
                         {
                             case 0:
                                 me->Say(CLINTAR_SPIRIT_SAY_START, 0, PlayerGUID);
@@ -418,7 +418,7 @@ public:
                         }
                         break;
                     case 6:
-                        switch(Step)
+                        switch (Step)
                         {
                             case 0:
                                 me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133);
@@ -433,7 +433,7 @@ public:
                         }
                         break;
                     case 15:
-                        switch(Step)
+                        switch (Step)
                         {
                             case 0:
                                 me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133);
@@ -447,7 +447,7 @@ public:
                         }
                         break;
                     case 16:
-                        switch(Step)
+                        switch (Step)
                         {
                             case 0:
                                 DoScriptText(CLINTAR_SPIRIT_SAY_GET_TWO, me, player);
@@ -460,7 +460,7 @@ public:
                         }
                         break;
                     case 20:
-                        switch(Step)
+                        switch (Step)
                         {
                             case 0:
                                 {
@@ -480,7 +480,7 @@ public:
                         }
                         break;
                     case 24:
-                        switch(Step)
+                        switch (Step)
                         {
                             case 0:
                                 me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133);
@@ -494,7 +494,7 @@ public:
                         }
                         break;
                     case 25:
-                        switch(Step)
+                        switch (Step)
                         {
                             case 0:
                                 DoScriptText(CLINTAR_SPIRIT_SAY_GET_THREE, me, player);
@@ -507,7 +507,7 @@ public:
                         }
                         break;
                     case 40:
-                        switch(Step)
+                        switch (Step)
                         {
                             case 0:
                                 me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 2);
diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp
index d0131068c3f..6b7197292dd 100644
--- a/src/server/scripts/Kalimdor/mulgore.cpp
+++ b/src/server/scripts/Kalimdor/mulgore.cpp
@@ -157,7 +157,7 @@ public:
                     uiEventTimer = 5000;
                     ++uiEventPhase;
 
-                    switch(uiEventPhase)
+                    switch (uiEventPhase)
                     {
                         case 1:
                             if (Unit* pUnit = Unit::GetUnit(*me, uiPlayerGUID))
diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp
index 000717e1c56..4fbcef167cc 100644
--- a/src/server/scripts/Kalimdor/silithus.cpp
+++ b/src/server/scripts/Kalimdor/silithus.cpp
@@ -37,7 +37,7 @@ EndContentData */
 ###*/
 
 #define GOSSIP_DEMITRIAN1 "What do you know of it?"
-#define GOSSIP_DEMITRIAN2 "I am listening , Demitrian."
+#define GOSSIP_DEMITRIAN2 "I am listening, Demitrian."
 #define GOSSIP_DEMITRIAN3 "Continue, please."
 #define GOSSIP_DEMITRIAN4 "A battle?"
 #define GOSSIP_DEMITRIAN5 "<Nod>"
@@ -541,7 +541,7 @@ public:
                 switch (AnimationCount)
                 {
                     case 0:
-                        DoScriptText(ANACHRONOS_SAY_1, me , Fandral);
+                        DoScriptText(ANACHRONOS_SAY_1, me, Fandral);
                         break;
                     case 1:
                         Fandral->SetTarget(me->GetGUID());
@@ -762,7 +762,7 @@ public:
                     case 61:
                         me->GetMotionMaster()->MoveCharge(-8057.1f, 1470.32f, 2.61f, 6);
                         if (player->IsInRange(me, 0, 15))
-                            player->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD , me);
+                            player->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD, me);
                         break;
                     case 62:
                         me->SetDisplayId(15500);
@@ -1181,12 +1181,12 @@ enum WSCreatures
     NPC_TEMPLAR_WATER = 15211,
     NPC_TEMPLAR_AIR = 15212,
     NPC_TEMPLAR_EARTH = 15307,
-    
+
     NPC_DUKE_FIRE = 15206,
     NPC_DUKE_WATER = 15207,
     NPC_DUKE_EARTH = 15208,
     NPC_DUKE_AIR = 15220,
-    
+
     NPC_ROYAL_FIRE = 15203,
     NPC_ROYAL_AIR = 15204,
     NPC_ROYAL_EARTH = 15205,
diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
index 132144fce0e..ff6127f336e 100644
--- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
+++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
@@ -121,7 +121,7 @@ public:
             if (!player)
                 return;
 
-            switch(i)
+            switch (i)
             {
             case 16:
                 DoScriptText(SAY_AMBUSH, me);
diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp
index 0c4b73b8658..549d741459e 100644
--- a/src/server/scripts/Kalimdor/tanaris.cpp
+++ b/src/server/scripts/Kalimdor/tanaris.cpp
@@ -178,7 +178,7 @@ public:
             if (!player)
                 return;
 
-            switch(i)
+            switch (i)
             {
                 case 0: DoScriptText(WHISPER_CUSTODIAN_1, me, player); break;
                 case 1: DoScriptText(WHISPER_CUSTODIAN_2, me, player); break;
@@ -435,7 +435,7 @@ public:
             if (!player)
                 return;
 
-            switch(i) {
+            switch (i) {
                 case 23:
                     me->SummonCreature(SPAWN_FIRST, -8350.96f, -4445.79f, 10.10f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
                     me->SummonCreature(SPAWN_FIRST, -8355.96f, -4447.79f, 10.10f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
@@ -591,7 +591,7 @@ public:
                             return;
                         }
 
-                        switch(m_uiPhasePostEvent)
+                        switch (m_uiPhasePostEvent)
                         {
                             case 1:
                                 DoScriptText(SAY_TOOG_POST_1, me);
diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp
index 21b0a5c6ee1..41d64ea5e19 100644
--- a/src/server/scripts/Kalimdor/the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/the_barrens.cpp
@@ -134,7 +134,7 @@ public:
             if (!player)
                 return;
 
-            switch(uiPointId)
+            switch (uiPointId)
             {
                 case 16:
                     DoScriptText(SAY_GIL_AT_LAST, me, player);
@@ -597,7 +597,7 @@ public:
             if (!player)
                 return;
 
-            switch(uiPointId)
+            switch (uiPointId)
             {
             case 0:
                 DoScriptText(SAY_STARTUP1, me);
@@ -625,7 +625,7 @@ public:
             if (!player)
                 return;
 
-            switch(uiPointId)
+            switch (uiPointId)
             {
                 case 9:
                     DoScriptText(SAY_STARTUP2, me, player);
@@ -654,7 +654,7 @@ public:
                 {
                     if (m_uiPostEventTimer <= uiDiff)
                     {
-                        switch(m_uiPostEventCount)
+                        switch (m_uiPostEventCount)
                         {
                             case 0:
                                 DoScriptText(SAY_PROGRESS_2, me);
diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp
index fdff6309be3..273396dd904 100644
--- a/src/server/scripts/Kalimdor/thousand_needles.cpp
+++ b/src/server/scripts/Kalimdor/thousand_needles.cpp
@@ -77,7 +77,7 @@ public:
 
         void WaypointReached(uint32 uiPointId)
         {
-            switch(uiPointId)
+            switch (uiPointId)
             {
                 case 0:
                     DoScriptText(SAY_KAN_START, me);
@@ -168,7 +168,7 @@ public:
 
         void WaypointReached(uint32 uiPointId)
         {
-            switch(uiPointId)
+            switch (uiPointId)
             {
                 case 8:
                     DoScriptText(SAY_LAKO_LOOK_OUT, me);
@@ -253,7 +253,7 @@ public:
 
         void WaypointReached(uint32 uiPointId)
         {
-            switch(uiPointId)
+            switch (uiPointId)
             {
                 case 15:
                     DoScriptText(SAY_WYVERN, me);
@@ -302,7 +302,7 @@ public:
     bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction)
     {
         player->PlayerTalkClass->ClearMenus();
-        switch(uiAction)
+        switch (uiAction)
         {
             case GOSSIP_ACTION_INFO_DEF+1:
                 player->CLOSE_GOSSIP_MENU();
diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp
index 05ba6b2234e..51f63ff5a8d 100644
--- a/src/server/scripts/Kalimdor/ungoro_crater.cpp
+++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp
@@ -283,7 +283,7 @@ public:
                             return;
                         }
 
-                        switch(m_uiEndEventProgress)
+                        switch (m_uiEndEventProgress)
                         {
                             case 1:
                                 DoScriptText(SAY_RIN_END_1, me);