diff options
author | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
---|---|---|
committer | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
commit | 42d1562183dd0598de155e30264393edc6925a21 (patch) | |
tree | 73263639af50fcf177ff9bdf3791d8fc5afce454 /src/server/scripts/EasternKingdoms/westfall.cpp | |
parent | 7f4be7e93a03c2f4c964590efb166c7dadcb6837 (diff) | |
parent | 7f89678bcda1b58ff0701c0915074e81a9caf720 (diff) |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore.git
Conflicts:
src/server/game/Entities/Player/Player.cpp
Diffstat (limited to 'src/server/scripts/EasternKingdoms/westfall.cpp')
-rw-r--r-- | src/server/scripts/EasternKingdoms/westfall.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index da1f666fbab..7c0703d158b 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -83,7 +83,7 @@ public: { if (HasEscortState(STATE_ESCORT_ESCORTING)) { - switch(uiWPHolder) + switch (uiWPHolder) { case 7: DoScriptText(SAY_DS_DOWN_1, me); break; case 8: DoScriptText(SAY_DS_DOWN_2, me); break; @@ -105,7 +105,7 @@ public: uiWPHolder = uiPoint; - switch(uiPoint) + switch (uiPoint) { case 4: SetEquipmentSlots(false, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE, EQUIP_ID_RIFLE); |