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/Texts/CreatureTextMgr.cpp | |
| 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/Texts/CreatureTextMgr.cpp')
| -rw-r--r-- | src/server/game/Texts/CreatureTextMgr.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index 87c6fb028dc..bc9f9231d9a 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -24,6 +24,7 @@ #include "DBCStores.h" #include "GridNotifiersImpl.h" #include "Log.h" +#include "MiscPackets.h" #include "ObjectMgr.h" #include "World.h" @@ -300,12 +301,10 @@ void CreatureTextMgr::SendSound(Creature* source, uint32 sound, ChatMsg msgType, if (!sound || !source) return; - WorldPacket data(SMSG_PLAY_SOUND, 4); - data << uint32(sound); - SendNonChatPacket(source, &data, msgType, whisperTarget, range, team, gmOnly); + SendNonChatPacket(source, WorldPackets::Misc::PlaySound(sound).Write(), msgType, whisperTarget, range, team, gmOnly); } -void CreatureTextMgr::SendNonChatPacket(WorldObject* source, WorldPacket* data, ChatMsg msgType, WorldObject const* whisperTarget, CreatureTextRange range, Team team, bool gmOnly) const +void CreatureTextMgr::SendNonChatPacket(WorldObject* source, WorldPacket const* data, ChatMsg msgType, WorldObject const* whisperTarget, CreatureTextRange range, Team team, bool gmOnly) const { switch (msgType) { |