diff options
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 26 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 6 |
2 files changed, 13 insertions, 19 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 40c35f45a0d..298d2199c5d 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -28,6 +28,7 @@ #include "Item.h" #include "Log.h" #include "Map.h" +#include "MiscPackets.h" #include "MovementInfo.h" #include "MovementPacketBuilder.h" #include "ObjectAccessor.h" @@ -3330,35 +3331,28 @@ void WorldObject::SetPhaseMask(uint32 newPhaseMask, bool update) UpdateObjectVisibility(); } -void WorldObject::PlayDistanceSound(uint32 sound_id, Player* target /*= nullptr*/) +void WorldObject::PlayDistanceSound(uint32 soundId, Player* target /*= nullptr*/) { - WorldPacket data(SMSG_PLAY_OBJECT_SOUND, 4+8); - data << uint32(sound_id); - data << uint64(GetGUID()); if (target) - target->SendDirectMessage(&data); + target->SendDirectMessage(WorldPackets::Misc::PlayObjectSound(GetGUID(), soundId).Write()); else - SendMessageToSet(&data, true); + SendMessageToSet(WorldPackets::Misc::PlayObjectSound(GetGUID(), soundId).Write(), true); } -void WorldObject::PlayDirectSound(uint32 sound_id, Player* target /*= nullptr*/) +void WorldObject::PlayDirectSound(uint32 soundId, Player* target /*= nullptr*/) { - WorldPacket data(SMSG_PLAY_SOUND, 4); - data << uint32(sound_id); if (target) - target->SendDirectMessage(&data); + target->SendDirectMessage(WorldPackets::Misc::PlaySound(soundId).Write()); else - SendMessageToSet(&data, true); + SendMessageToSet(WorldPackets::Misc::PlaySound(soundId).Write(), true); } -void WorldObject::PlayDirectMusic(uint32 music_id, Player* target /*= nullptr*/) +void WorldObject::PlayDirectMusic(uint32 musicId, Player* target /*= nullptr*/) { - WorldPacket data(SMSG_PLAY_MUSIC, 4); - data << uint32(music_id); if (target) - target->SendDirectMessage(&data); + target->SendDirectMessage(WorldPackets::Misc::PlayMusic(musicId).Write()); else - SendMessageToSet(&data, true); + SendMessageToSet(WorldPackets::Misc::PlayMusic(musicId).Write(), true); } void WorldObject::DestroyForNearbyPlayers() diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 20b5a3a806e..231732e0442 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -364,9 +364,9 @@ 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 = nullptr); - void PlayDirectSound(uint32 sound_id, Player* target = nullptr); - void PlayDirectMusic(uint32 music_id, Player* target = nullptr); + void PlayDistanceSound(uint32 soundId, Player* target = nullptr); + void PlayDirectSound(uint32 soundId, Player* target = nullptr); + void PlayDirectMusic(uint32 musicId, Player* target = nullptr); void SendObjectDeSpawnAnim(ObjectGuid guid); |