diff options
| author | Sebastian Valle <s.v.h21@hotmail.com> | 2013-10-29 13:13:37 -0500 |
|---|---|---|
| committer | Sebastian Valle <s.v.h21@hotmail.com> | 2013-10-29 13:13:37 -0500 |
| commit | bb057ae40be2733f3f582a93e585b8bb67cf1520 (patch) | |
| tree | 76a7f9727dc33d068b3c2433189bee42a7edcde1 /src/server/game/Handlers/ChatHandler.cpp | |
| parent | 4ce12dc481323c11b4830d06f8080412d855cc64 (diff) | |
| parent | 3d5a317b755f4b6eb2d9a29fd7d9291415dfa6eb (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw
Conflicts:
src/server/collision/Management/MMapManager.h
Diffstat (limited to 'src/server/game/Handlers/ChatHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/ChatHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 8570ad03220..35f1bbbdb56 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -503,7 +503,7 @@ namespace Trinity { public: EmoteChatBuilder(Player const& player, uint32 text_emote, uint32 emote_num, Unit const* target) - : i_player(player), i_text_emote(text_emote), i_emote_num(emote_num), i_target(target) {} + : i_player(player), i_text_emote(text_emote), i_emote_num(emote_num), i_target(target) { } void operator()(WorldPacket& data, LocaleConstant loc_idx) { |