diff options
| author | Shocker <shocker@freakz.ro> | 2012-03-30 14:49:44 -0700 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2012-03-30 14:49:44 -0700 |
| commit | b2924379894d26528d360e6c5eba401428f9a285 (patch) | |
| tree | b41cf71d1f9a67b3abe568f4fcf2faf1d1f255e6 /src/server/scripts/EasternKingdoms/westfall.cpp | |
| parent | 3fb947d955c604000df0ec26ed80060d315c41d7 (diff) | |
| parent | ba2ee48fc6ddd7e9c965690c97c669cb69ccf30e (diff) | |
Merge pull request #5933 from GyxTom/master
Core/Misc: Code style and remove unused define
Diffstat (limited to 'src/server/scripts/EasternKingdoms/westfall.cpp')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/westfall.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
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); |