diff options
| author | ForesterDev <11771800+ForesterDev@users.noreply.github.com> | 2019-08-23 21:28:21 +0400 |
|---|---|---|
| committer | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-08-23 19:28:21 +0200 |
| commit | 07e2264964ef728050e55e5ec5217c4fb4fe1af2 (patch) | |
| tree | be1d795264d98b97dc8613927fa396590f9d89a3 /src/server/game/Entities/Object | |
| parent | 448facc5e794bde5068533825ebfd55435effb57 (diff) | |
Core/PacketIO: updated SMSG_PLAY_SOUND, SMSG_PLAY_MUSIC and SMSG_PLAY_OBJECT_SOUND (#23636)
* Core/PacketIO: SMSG_PLAY_SOUND
(cherry picked from commit 82a33c7fa868d5ace7f855dba26b5f41c12bab6e)
# Conflicts:
# src/server/game/Battlefield/Battlefield.cpp
# src/server/game/Battlegrounds/Battleground.cpp
# src/server/game/Battlegrounds/BattlegroundMgr.cpp
# src/server/game/Battlegrounds/BattlegroundMgr.h
# src/server/game/Entities/Object/Object.cpp
# src/server/game/Server/Packets/MiscPackets.cpp
# src/server/game/Server/Protocol/Opcodes.cpp
# src/server/game/Texts/CreatureTextMgr.cpp
# src/server/game/Texts/CreatureTextMgr.h
# src/server/scripts/Commands/cs_misc.cpp
* Update for 3.3.5
* Core/PacketIO: updated and enabled SMSG_PLAY_MUSIC
(cherry picked from commit c6718dc120cae4217bb673b9a0ad1e83b4780f60)
# Conflicts:
# src/server/game/Maps/Map.cpp
# src/server/game/Server/Packets/MiscPackets.cpp
# src/server/game/Server/Protocol/Opcodes.cpp
# src/server/game/Server/Protocol/Opcodes.h
# src/server/game/Spells/SpellEffects.cpp
* Core/Packets: added SMSG_PLAY_OBJECT_SOUND packet class
(cherry picked from commit 1272e9eea684d1f155709baee44a301ff938ade5)
# Conflicts:
# src/server/game/Server/Packets/MiscPackets.cpp
# src/server/game/Server/Packets/MiscPackets.h
# src/server/game/Server/Protocol/Opcodes.cpp
* fic build
* change variable names
* fix build error field will be initialized after
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); |
