aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/Map.cpp
diff options
context:
space:
mode:
authorForesterDev <11771800+ForesterDev@users.noreply.github.com>2019-08-23 21:28:21 +0400
committerGiacomo Pozzoni <giacomopoz@gmail.com>2019-08-23 19:28:21 +0200
commit07e2264964ef728050e55e5ec5217c4fb4fe1af2 (patch)
treebe1d795264d98b97dc8613927fa396590f9d89a3 /src/server/game/Maps/Map.cpp
parent448facc5e794bde5068533825ebfd55435effb57 (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/Maps/Map.cpp')
-rw-r--r--src/server/game/Maps/Map.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 5baf83a7f73..055a1a704ad 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -4529,11 +4529,7 @@ void Map::SendZoneDynamicInfo(uint32 zoneId, Player* player) const
return;
if (uint32 music = itr->second.MusicId)
- {
- WorldPacket data(SMSG_PLAY_MUSIC, 4);
- data << uint32(music);
- player->SendDirectMessage(&data);
- }
+ player->SendDirectMessage(WorldPackets::Misc::PlayMusic(music).Write());
SendZoneWeather(itr->second, player);
@@ -4578,13 +4574,13 @@ void Map::SetZoneMusic(uint32 zoneId, uint32 musicId)
Map::PlayerList const& players = GetPlayers();
if (!players.isEmpty())
{
- WorldPacket data(SMSG_PLAY_MUSIC, 4);
- data << uint32(musicId);
+ WorldPackets::Misc::PlayMusic playMusic(musicId);
+ playMusic.Write();
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
if (Player* player = itr->GetSource())
if (player->GetZoneId() == zoneId)
- player->SendDirectMessage(&data);
+ player->SendDirectMessage(playMusic.GetRawPacket());
}
}