From 391d68be20d883a976c75a0b0833d616b178e025 Mon Sep 17 00:00:00 2001 From: Gyx <2359980687@qq.com> Date: Thu, 29 Mar 2012 15:44:24 +0800 Subject: 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> --- src/server/scripts/EasternKingdoms/westfall.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'src/server/scripts/EasternKingdoms/westfall.cpp') diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index c8d2afc3375..46f1526c5bf 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -85,9 +85,15 @@ public: { switch (uiWPHolder) { - case 7: DoScriptText(SAY_DS_DOWN_1, me); break; - case 8: DoScriptText(SAY_DS_DOWN_2, me); break; - case 9: DoScriptText(SAY_DS_DOWN_3, me); break; + case 7: + DoScriptText(SAY_DS_DOWN_1, me); + break; + case 8: + DoScriptText(SAY_DS_DOWN_2, me); + break; + case 9: + DoScriptText(SAY_DS_DOWN_3, me); + break; } } else @@ -96,16 +102,15 @@ public: uiShootTimer = 0; } - void WaypointReached(uint32 uiPoint) + void WaypointReached(uint32 waypointId) { Player* player = GetPlayerForEscort(); - if (!player) return; - uiWPHolder = uiPoint; + uiWPHolder = waypointId; - switch (uiPoint) + switch (waypointId) { case 4: SetEquipmentSlots(false, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE, EQUIP_ID_RIFLE); @@ -226,14 +231,13 @@ public: { npc_defias_traitorAI(Creature* creature) : npc_escortAI(creature) { Reset(); } - void WaypointReached(uint32 i) + void WaypointReached(uint32 waypointId) { Player* player = GetPlayerForEscort(); - if (!player) return; - switch (i) + switch (waypointId) { case 35: SetRun(false); -- cgit v1.2.3