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/Outland/zangarmarsh.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/Outland/zangarmarsh.cpp')
| -rw-r--r-- | src/server/scripts/Outland/zangarmarsh.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index 62d0893f014..ddffcb53e61 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -328,7 +328,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 4: DoScriptText(SAY_AMBUSH1, me, player); @@ -407,7 +407,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->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TIMOTHY_DANIELS1, creature->GetGUID()); |