Core/Battleground: Dropped battleground texts from trinity_string and replaced them with proper BroadcastText

1 files changed, 20 insertions, 4 deletions

diff --git a/src/server/game/Texts/ChatTextBuilder.h b/src/server/game/Texts/ChatTextBuilder.h
index f28b67b7e8a..20258c2ddcc 100644
--- a/src/server/game/Texts/ChatTextBuilder.h
+++ b/src/server/game/Texts/ChatTextBuilder.h
@@ -22,7 +22,6 @@
 #include "SharedDefines.h"
 #include <string>
 
-class Unit;
 class WorldObject;
 
 namespace WorldPackets
@@ -35,15 +34,16 @@ namespace Trinity
     class BroadcastTextBuilder
     {
         public:
-            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) { }
+            BroadcastTextBuilder(WorldObject const* obj, ChatMsg msgType, uint32 textId, uint8 gender, WorldObject const* target = nullptr, uint32 achievementId = 0)
+                : _source(obj), _msgType(msgType), _textId(textId), _gender(gender), _target(target), _achievementId(achievementId) { }
 
             WorldPackets::Packet* operator()(LocaleConstant locale) const;
 
         private:
-            Unit const* _source;
+            WorldObject const* _source;
             ChatMsg _msgType;
             uint32 _textId;
+            uint8 _gender;
             WorldObject const* _target;
             uint32 _achievementId;
     };
@@ -63,6 +63,22 @@ namespace Trinity
             Language _language;
             WorldObject const* _target;
     };
+
+    class TrinityStringChatBuilder
+    {
+        public:
+            TrinityStringChatBuilder(WorldObject const* obj, ChatMsg msgType, uint32 textId, WorldObject const* target = nullptr, va_list* args = nullptr)
+                : _source(obj), _msgType(msgType), _textId(textId), _target(target), _args(args) { }
+
+            WorldPackets::Packet* operator()(LocaleConstant locale) const;
+
+        private:
+            WorldObject const* _source;
+            ChatMsg _msgType;
+            uint32 _textId;
+            WorldObject const* _target;
+            va_list* _args;
+    };
 }
 // namespace Trinity