aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Texts/ChatTextBuilder.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Texts/ChatTextBuilder.h')
-rw-r--r--src/server/game/Texts/ChatTextBuilder.h17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/server/game/Texts/ChatTextBuilder.h b/src/server/game/Texts/ChatTextBuilder.h
index 40edaeebae7..d6a7fe7635d 100644
--- a/src/server/game/Texts/ChatTextBuilder.h
+++ b/src/server/game/Texts/ChatTextBuilder.h
@@ -20,7 +20,10 @@
#include "Common.h"
#include "ChatPackets.h"
+#include "MiscPackets.h"
#include "SharedDefines.h"
+
+#include <memory>
#include <string>
class Player;
@@ -39,14 +42,17 @@ namespace Trinity
std::string Text;
uint32 AchievementId;
LocaleConstant Locale;
+ uint32 PlayerConditionID;
public:
// caches
WorldPackets::Chat::Chat UntranslatedPacket;
mutable Optional<WorldPackets::Chat::Chat> TranslatedPacket;
+ Optional<WorldPackets::Chat::Emote> EmotePacket;
+ std::unique_ptr<WorldPackets::ServerPacket> SoundPacket;
ChatPacketSender(ChatMsg chatType, ::Language language, WorldObject const* sender, WorldObject const* receiver, std::string message,
- uint32 achievementId = 0, LocaleConstant locale = LOCALE_enUS);
+ uint32 achievementId = 0, LocaleConstant locale = LOCALE_enUS, uint32 broadcastTextId = 0, uint16 emoteId = 0, uint32 soundKitId = 0, SoundKitPlayType soundKitPlayType = SoundKitPlayType::Normal, uint32 playerConditionId = 0);
void operator()(Player const* player) const;
};
@@ -103,8 +109,8 @@ namespace Trinity
class CreatureTextTextBuilder
{
public:
- CreatureTextTextBuilder(WorldObject const* obj, WorldObject const* speaker, uint8 gender, ChatMsg msgtype, uint8 textGroup, uint32 id, Language language, WorldObject const* target)
- : _source(obj), _talker(speaker), _gender(gender), _msgType(msgtype), _textGroup(textGroup), _textId(id), _language(language), _target(target) { }
+ CreatureTextTextBuilder(WorldObject const* obj, WorldObject const* speaker, uint8 gender, ChatMsg msgtype, uint8 textGroup, uint32 id, Language language, WorldObject const* target, uint32 broadcastTextId, uint16 emoteId, uint32 soundKitId, SoundKitPlayType soundKitPlayType, uint32 playerConditionId)
+ : _source(obj), _talker(speaker), _gender(gender), _msgType(msgtype), _textGroup(textGroup), _textId(id), _language(language), _target(target), _broadcastTextId(broadcastTextId), _emoteId(emoteId), _soundKitId(soundKitId), _soundKitPlayType(soundKitPlayType), _playerConditionId(playerConditionId) { }
ChatPacketSender* operator()(LocaleConstant locale) const;
@@ -117,6 +123,11 @@ namespace Trinity
uint32 _textId;
Language _language;
WorldObject const* _target;
+ uint32 _broadcastTextId;
+ uint16 _emoteId;
+ uint32 _soundKitId;
+ SoundKitPlayType _soundKitPlayType;
+ uint32 _playerConditionId;
};
}
// namespace Trinity