From 2e4609f6e18c181fbb54ec851a9ccd5bd3c6eb7b Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 27 Dec 2020 22:43:36 +0100 Subject: Core/Chat: Send broadcast text id in sound packets to allow playing encrypted sound files --- src/server/game/Entities/Object/Object.cpp | 6 +++--- src/server/game/Entities/Object/Object.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/game/Entities') diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 477a0fa984b..96992a698a5 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2212,12 +2212,12 @@ void WorldObject::PlayDistanceSound(uint32 soundId, Player* target /*= nullptr*/ SendMessageToSet(WorldPackets::Misc::PlaySpeakerbotSound(GetGUID(), soundId).Write(), true); } -void WorldObject::PlayDirectSound(uint32 soundId, Player* target /*= nullptr*/) +void WorldObject::PlayDirectSound(uint32 soundId, Player* target /*= nullptr*/, uint32 broadcastTextId /*= 0*/) { if (target) - target->SendDirectMessage(WorldPackets::Misc::PlaySound(GetGUID(), soundId).Write()); + target->SendDirectMessage(WorldPackets::Misc::PlaySound(GetGUID(), soundId, broadcastTextId).Write()); else - SendMessageToSet(WorldPackets::Misc::PlaySound(GetGUID(), soundId).Write(), true); + SendMessageToSet(WorldPackets::Misc::PlaySound(GetGUID(), soundId, broadcastTextId).Write(), true); } void WorldObject::PlayDirectMusic(uint32 musicId, Player* target /*= nullptr*/) diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 3a5f06062ee..5efc9825bc7 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -472,7 +472,7 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation virtual uint8 GetLevelForTarget(WorldObject const* /*target*/) const { return 1; } void PlayDistanceSound(uint32 soundId, Player* target = nullptr); - void PlayDirectSound(uint32 soundId, Player* target = nullptr); + void PlayDirectSound(uint32 soundId, Player* target = nullptr, uint32 broadcastTextId = 0); void PlayDirectMusic(uint32 musicId, Player* target = nullptr); virtual void SaveRespawnTime(uint32 /*forceDelay*/ = 0, bool /*saveToDB*/ = true) { } -- cgit v1.2.3