Core/Game: Include cleanup, part 3

1 files changed, 13 insertions, 16 deletions

diff --git a/src/server/game/Texts/ChatTextBuilder.h b/src/server/game/Texts/ChatTextBuilder.h
index 825ceff20f3..8ed611be469 100644
--- a/src/server/game/Texts/ChatTextBuilder.h
+++ b/src/server/game/Texts/ChatTextBuilder.h
@@ -18,9 +18,17 @@
 #ifndef __CHATTEXT_BUILDER_H
 #define __CHATTEXT_BUILDER_H
 
-#include "Chat.h"
-#include "ObjectMgr.h"
-#include "Packets/ChatPackets.h"
+#include "Common.h"
+#include "SharedDefines.h"
+#include <string>
+
+class Unit;
+class WorldObject;
+
+namespace WorldPackets
+{
+    class Packet;
+}
 
 namespace Trinity
 {
@@ -30,13 +38,7 @@ namespace Trinity
             BroadcastTextBuilder(Unit const* obj, ChatMsg msgType, uint32 textId, WorldObject const* target = nullptr, uint32 achievementId = 0)
                 : _source(obj), _msgType(msgType), _textId(textId), _target(target), _achievementId(achievementId) { }
 
-            WorldPackets::Chat::Chat* operator()(LocaleConstant locale) const
-            {
-                BroadcastTextEntry const* bct = sBroadcastTextStore.LookupEntry(_textId);
-                WorldPackets::Chat::Chat* chat = new WorldPackets::Chat::Chat();
-                chat->Initialize(_msgType, bct ? Language(bct->Language) : LANG_UNIVERSAL, _source, _target, bct ? DB2Manager::GetBroadcastTextValue(bct, locale, _source->getGender()) : "", _achievementId, "", locale);
-                return chat;
-            }
+            WorldPackets::Packet* operator()(LocaleConstant locale) const;
 
         private:
             Unit const* _source;
@@ -52,12 +54,7 @@ namespace Trinity
             CustomChatTextBuilder(WorldObject const* obj, ChatMsg msgType, std::string const& text, Language language = LANG_UNIVERSAL, WorldObject const* target = nullptr)
                 : _source(obj), _msgType(msgType), _text(text), _language(language), _target(target) { }
 
-            WorldPackets::Chat::Chat* operator()(LocaleConstant locale) const
-            {
-                WorldPackets::Chat::Chat* chat = new WorldPackets::Chat::Chat();
-                chat->Initialize(_msgType, _language, _source, _target, _text, 0, "", locale);
-                return chat;
-            }
+            WorldPackets::Packet* operator()(LocaleConstant locale) const;
 
         private:
             WorldObject const* _source;