Core/Script: Code style.

WaypointReached(uint32 i) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 uiPointId) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*point*/) -> WaypointReached(uint32 /*waypointId*/)
WaypointReached(uint32 uiI) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*i*/) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 uiWPointId) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*wp*/) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*point*/) -> WaypointReached(uint32 waypointId)

Signed-off-by: Gyx <2359980687@qq.com>

8 files changed, 115 insertions, 86 deletions

diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
index 8fd1b163ce3..784adad166c 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
@@ -102,7 +102,7 @@ public:
             npc_escortAI::MoveInLineOfSight(who);
         }
 
-        void WaypointReached(uint32 /*i*/)
+        void WaypointReached(uint32 /*waypointId*/)
         {
         }
 
diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp
index 75a402a5338..b0e19f0e322 100644
--- a/src/server/scripts/Outland/hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/hellfire_peninsula.cpp
@@ -180,9 +180,9 @@ public:
             npc_escortAI::MoveInLineOfSight(who);
         }
 
-        void WaypointReached(uint32 uiPointId)
+        void WaypointReached(uint32 waypointId)
         {
-            switch (uiPointId)
+            switch (waypointId)
             {
                 case 0:
                     DoScriptText(EMOTE_WOLF_LIFT_HEAD, me);
@@ -402,38 +402,37 @@ public:
     {
         npc_wounded_blood_elfAI(Creature* creature) : npc_escortAI(creature) {}
 
-        void WaypointReached(uint32 i)
+        void WaypointReached(uint32 waypointId)
         {
             Player* player = GetPlayerForEscort();
-
             if (!player)
                 return;
 
-            switch (i)
+            switch (waypointId)
             {
-            case 0:
-                DoScriptText(SAY_ELF_START, me, player);
-                break;
-            case 9:
-                DoScriptText(SAY_ELF_SUMMON1, me, player);
-                // Spawn two Haal'eshi Talonguard
-                DoSpawnCreature(16967, -15, -15, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                DoSpawnCreature(16967, -17, -17, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                break;
-            case 13:
-                DoScriptText(SAY_ELF_RESTING, me, player);
-                break;
-            case 14:
-                DoScriptText(SAY_ELF_SUMMON2, me, player);
-                // Spawn two Haal'eshi Windwalker
-                DoSpawnCreature(16966, -15, -15, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                DoSpawnCreature(16966, -17, -17, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                break;
-            case 27:
-                DoScriptText(SAY_ELF_COMPLETE, me, player);
-                // Award quest credit
-                player->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH, me);
-                break;
+                case 0:
+                    DoScriptText(SAY_ELF_START, me, player);
+                    break;
+                case 9:
+                    DoScriptText(SAY_ELF_SUMMON1, me, player);
+                    // Spawn two Haal'eshi Talonguard
+                    DoSpawnCreature(16967, -15, -15, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    DoSpawnCreature(16967, -17, -17, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    break;
+                case 13:
+                    DoScriptText(SAY_ELF_RESTING, me, player);
+                    break;
+                case 14:
+                    DoScriptText(SAY_ELF_SUMMON2, me, player);
+                    // Spawn two Haal'eshi Windwalker
+                    DoSpawnCreature(16966, -15, -15, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    DoSpawnCreature(16966, -17, -17, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    break;
+                case 27:
+                    DoScriptText(SAY_ELF_COMPLETE, me, player);
+                    // Award quest credit
+                    player->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH, me);
+                    break;
             }
         }
 
diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp
index 50cc1a00e47..8080a1402af 100644
--- a/src/server/scripts/Outland/nagrand.cpp
+++ b/src/server/scripts/Outland/nagrand.cpp
@@ -221,9 +221,9 @@ public:
             DoCast(me, SPELL_EARTHBIND_TOTEM, false);
         }
 
-        void WaypointReached(uint32 uiPointId)
+        void WaypointReached(uint32 waypointId)
         {
-            switch (uiPointId)
+            switch (waypointId)
             {
                 case 7:
                     DoScriptText(SAY_MAG_MORE, me);
@@ -565,9 +565,9 @@ public:
             }
         }
 
-        void WaypointReached(uint32 PointId)
+        void WaypointReached(uint32 waypointId)
         {
-            switch(PointId)
+            switch (waypointId)
             {
                 case 3:
                 {
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index dc401ac3c7a..17b9ec23f3d 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -889,33 +889,32 @@ public:
                 player->FailQuest(Q_ALMABTRIEB);
         }
 
-        void WaypointReached(uint32 i)
+        void WaypointReached(uint32 waypointId)
         {
             Player* player = GetPlayerForEscort();
-
             if (!player)
                 return;
 
-            switch (i)
+            switch (waypointId)
             {
                 case 3: //first spawn
                     me->SummonCreature(SPAWN_FIRST, 2449.67f, 2183.11f, 96.85f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
                     me->SummonCreature(SPAWN_FIRST, 2449.53f, 2184.43f, 96.36f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
                     me->SummonCreature(SPAWN_FIRST, 2449.85f, 2186.34f, 97.57f, 6.08f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
                     break;
-
                 case 7:
                     me->SummonCreature(SPAWN_SECOND, 2309.64f, 2186.24f, 92.25f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
                     me->SummonCreature(SPAWN_SECOND, 2309.25f, 2183.46f, 91.75f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
                     break;
-
                 case 12:
                     player->GroupEventHappens(Q_ALMABTRIEB, me);
                     if (me->FindNearestCreature(N_THADELL, 30))
-                        DoScriptText(SAY_THADELL_1, me); break;
+                        DoScriptText(SAY_THADELL_1, me);
+                    break;
                 case 13:
                     if (me->FindNearestCreature(N_THADELL, 30))
-                        DoScriptText(SAY_THADELL_2, me, player); break;
+                        DoScriptText(SAY_THADELL_2, me, player);
+                    break;
             }
         }
 
@@ -964,13 +963,13 @@ public:
             uiTakeTimer=3000;
         }
 
-        void WaypointReached(uint32 i)
+        void WaypointReached(uint32 waypointId)
         {
             Player* player = GetPlayerForEscort();
             if (!player)
                 return;
 
-            switch (i)
+            switch (waypointId)
             {
                 case 7:
                 case 17:
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index 059373c6589..f9aaf87fa8a 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -1054,14 +1054,13 @@ public:
             m_uiHealingTimer = 0;
         }
 
-        void WaypointReached(uint32 uiPointId)
+        void WaypointReached(uint32 waypointId)
         {
             Player* player = GetPlayerForEscort();
-
             if (!player)
                 return;
 
-            switch (uiPointId)
+            switch (waypointId)
             {
                 case 13:
                     DoScriptText(SAY_WIL_PROGRESS1, me, player);
diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp
index 639c0c25cf4..79cce47e16c 100644
--- a/src/server/scripts/Outland/shattrath_city.cpp
+++ b/src/server/scripts/Outland/shattrath_city.cpp
@@ -319,36 +319,77 @@ public:
     public:
         npc_kservantAI(Creature* creature) : npc_escortAI(creature) {}
 
-        void WaypointReached(uint32 i)
+        void WaypointReached(uint32 waypointId)
         {
             Player* player = GetPlayerForEscort();
-
             if (!player)
                 return;
 
-            switch (i)
+            switch (waypointId)
             {
-                case 0: DoScriptText(SAY1, me, player); break;
-                case 4: DoScriptText(WHISP1, me, player); break;
-                case 6: DoScriptText(WHISP2, me, player); break;
-                case 7: DoScriptText(WHISP3, me, player); break;
-                case 8: DoScriptText(WHISP4, me, player); break;
-                case 17: DoScriptText(WHISP5, me, player); break;
-                case 18: DoScriptText(WHISP6, me, player); break;
-                case 19: DoScriptText(WHISP7, me, player); break;
-                case 33: DoScriptText(WHISP8, me, player); break;
-                case 34: DoScriptText(WHISP9, me, player); break;
-                case 35: DoScriptText(WHISP10, me, player); break;
-                case 36: DoScriptText(WHISP11, me, player); break;
-                case 43: DoScriptText(WHISP12, me, player); break;
-                case 44: DoScriptText(WHISP13, me, player); break;
-                case 49: DoScriptText(WHISP14, me, player); break;
-                case 50: DoScriptText(WHISP15, me, player); break;
-                case 51: DoScriptText(WHISP16, me, player); break;
-                case 52: DoScriptText(WHISP17, me, player); break;
-                case 53: DoScriptText(WHISP18, me, player); break;
-                case 54: DoScriptText(WHISP19, me, player); break;
-                case 55: DoScriptText(WHISP20, me, player); break;
+                case 0:
+                    DoScriptText(SAY1, me, player);
+                    break;
+                case 4:
+                    DoScriptText(WHISP1, me, player);
+                    break;
+                case 6:
+                    DoScriptText(WHISP2, me, player);
+                    break;
+                case 7:
+                    DoScriptText(WHISP3, me, player);
+                    break;
+                case 8:
+                    DoScriptText(WHISP4, me, player);
+                    break;
+                case 17:
+                    DoScriptText(WHISP5, me, player);
+                    break;
+                case 18:
+                    DoScriptText(WHISP6, me, player);
+                    break;
+                case 19:
+                    DoScriptText(WHISP7, me, player);
+                    break;
+                case 33:
+                    DoScriptText(WHISP8, me, player);
+                    break;
+                case 34:
+                    DoScriptText(WHISP9, me, player);
+                    break;
+                case 35:
+                    DoScriptText(WHISP10, me, player);
+                    break;
+                case 36:
+                    DoScriptText(WHISP11, me, player);
+                    break;
+                case 43:
+                    DoScriptText(WHISP12, me, player);
+                    break;
+                case 44:
+                    DoScriptText(WHISP13, me, player);
+                    break;
+                case 49:
+                    DoScriptText(WHISP14, me, player);
+                    break;
+                case 50:
+                    DoScriptText(WHISP15, me, player);
+                    break;
+                case 51:
+                    DoScriptText(WHISP16, me, player);
+                    break;
+                case 52:
+                    DoScriptText(WHISP17, me, player);
+                    break;
+                case 53:
+                    DoScriptText(WHISP18, me, player);
+                    break;
+                case 54:
+                    DoScriptText(WHISP19, me, player);
+                    break;
+                case 55:
+                    DoScriptText(WHISP20, me, player);
+                    break;
                 case 56:
                     DoScriptText(WHISP21, me, player);
                     player->GroupEventHappens(10211, me);
diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp
index 87cbf095848..b8f4be9e599 100644
--- a/src/server/scripts/Outland/terokkar_forest.cpp
+++ b/src/server/scripts/Outland/terokkar_forest.cpp
@@ -202,13 +202,13 @@ public:
     public:
         npc_skywingAI(Creature* creature) : npc_escortAI(creature) {}
 
-        void WaypointReached(uint32 i)
+        void WaypointReached(uint32 waypointId)
         {
             Player* player = GetPlayerForEscort();
             if (!player)
                 return;
 
-            switch (i)
+            switch (waypointId)
             {
                 case 8:
                     player->AreaExploredOrEventHappens(10898);
@@ -461,32 +461,27 @@ public:
     {
         npc_isla_starmaneAI(Creature* creature) : npc_escortAI(creature) {}
 
-        void WaypointReached(uint32 i)
+        void WaypointReached(uint32 waypointId)
         {
             Player* player = GetPlayerForEscort();
-
             if (!player)
                 return;
 
-            switch (i)
+            switch (waypointId)
             {
                 case 0:
                     if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 10))
                         Cage->SetGoState(GO_STATE_ACTIVE);
                     break;
-
                 case 2:
                     DoScriptText(SAY_PROGRESS_1, me, player);
                     break;
-
                 case 5:
                     DoScriptText(SAY_PROGRESS_2, me, player);
                     break;
-
                 case 6:
                     DoScriptText(SAY_PROGRESS_3, me, player);
                     break;
-
                 case 29:
                     DoScriptText(SAY_PROGRESS_4, me, player);
                     if (player->GetTeam() == ALLIANCE)
@@ -495,11 +490,9 @@ public:
                         player->GroupEventHappens(QUEST_EFTW_H, me);
                     me->SetInFront(player);
                     break;
-
                 case 30:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE);
                     break;
-
                 case 31:
                     DoCast(me, SPELL_CAT);
                     me->SetWalk(false);
@@ -673,14 +666,13 @@ public:
     {
         npc_akunoAI(Creature* creature) : npc_escortAI(creature) {}
 
-        void WaypointReached(uint32 i)
+        void WaypointReached(uint32 waypointId)
         {
             Player* player = GetPlayerForEscort();
-
             if (!player)
                 return;
 
-            switch (i)
+            switch (waypointId)
             {
                 case 3:
                     me->SummonCreature(NPC_CABAL_SKRIMISHER, -2795.99f, 5420.33f, -34.53f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp
index 7557de9ca36..90ce070ecc7 100644
--- a/src/server/scripts/Outland/zangarmarsh.cpp
+++ b/src/server/scripts/Outland/zangarmarsh.cpp
@@ -322,14 +322,13 @@ public:
 
         void Reset() { }
 
-        void WaypointReached(uint32 i)
+        void WaypointReached(uint32 waypointId)
         {
             Player* player = GetPlayerForEscort();
-
             if (!player)
                 return;
 
-            switch (i)
+            switch (waypointId)
             {
                 case 4:
                     DoScriptText(SAY_AMBUSH1, me, player);