diff options
| author | joschiwald <joschiwald.trinity@gmail.com> | 2016-12-03 16:45:30 +0100 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2016-12-03 16:45:30 +0100 |
| commit | 7ee0e2ad08fa73a1f71fe12bbac293c9a24dc0c5 (patch) | |
| tree | 0d0612244d31b7fcf607d6a48c590dfebc153365 /src/server/game/Entities/Object | |
| parent | e66acf820b3cf1df56bc93a8ac75e151fd7718b5 (diff) | |
Core/Packets: added SMSG_PLAY_SPEAKERBOT_SOUND packet class
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 15 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 4 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 7efce3d5976..edd737b1771 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2978,23 +2978,20 @@ bool WorldObject::IsInPhase(WorldObject const* obj) const return Trinity::Containers::Intersects(_phases.begin(), _phases.end(), obj->GetPhases().begin(), obj->GetPhases().end()); } -void WorldObject::PlayDistanceSound(uint32 sound_id, Player* target /*= NULL*/) +void WorldObject::PlayDistanceSound(uint32 soundId, Player* target /*= nullptr*/) { - WorldPacket data(SMSG_PLAY_SPEAKERBOT_SOUND, 4 + 8); - data << uint32(sound_id); - data << GetGUID(); if (target) - target->SendDirectMessage(&data); + target->SendDirectMessage(WorldPackets::Misc::PlaySpeakerbotSound(GetGUID(), soundId).Write()); else - SendMessageToSet(&data, true); + SendMessageToSet(WorldPackets::Misc::PlaySpeakerbotSound(GetGUID(), soundId).Write(), true); } -void WorldObject::PlayDirectSound(uint32 sound_id, Player* target /*= NULL*/) +void WorldObject::PlayDirectSound(uint32 soundId, Player* target /*= nullptr*/) { if (target) - target->SendDirectMessage(WorldPackets::Misc::PlaySound(GetGUID(), sound_id).Write()); + target->SendDirectMessage(WorldPackets::Misc::PlaySound(GetGUID(), soundId).Write()); else - SendMessageToSet(WorldPackets::Misc::PlaySound(GetGUID(), sound_id).Write(), true); + SendMessageToSet(WorldPackets::Misc::PlaySound(GetGUID(), soundId).Write(), true); } void WorldObject::DestroyForNearbyPlayers() diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 082f3dde6d7..bbab30659b2 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -610,8 +610,8 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation virtual uint8 getLevelForTarget(WorldObject const* /*target*/) const { return 1; } - void PlayDistanceSound(uint32 sound_id, Player* target = NULL); - void PlayDirectSound(uint32 sound_id, Player* target = NULL); + void PlayDistanceSound(uint32 soundId, Player* target = nullptr); + void PlayDirectSound(uint32 soundId, Player* target = nullptr); virtual void SaveRespawnTime() { } void AddObjectToRemoveList(); |