diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-13 22:59:28 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-13 22:59:28 +0200 |
| commit | 0591ee53b5d848009fd258f5b2f076a7ab045fa3 (patch) | |
| tree | ec01cf3dceb63c58cac3c7e6991206831218c821 /src | |
| parent | ca3961f9875608bd02ba42445f165a02002444f8 (diff) | |
Core/Misc: Fix merge fail
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Battlefield/Battlefield.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Battlegrounds/BattlegroundMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Texts/CreatureTextMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_misc.cpp | 3 |
5 files changed, 7 insertions, 6 deletions
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index 41de1970344..935dd8d72f9 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -356,7 +356,7 @@ void Battlefield::EndBattle(bool endByTimer) void Battlefield::DoPlaySoundToAll(uint32 SoundID) { WorldPacket data; - data.Initialize(SMSG_PLAY_SOUND, 4); + data.Initialize(SMSG_PLAY_SOUND, 4 + 8); data << uint32(SoundID); data << uint64(0); diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index c51c7aa95c2..a0fd1f988a7 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -435,7 +435,7 @@ void BattlegroundMgr::BuildUpdateWorldStatePacket(WorldPacket* data, uint32 fiel void BattlegroundMgr::BuildPlaySoundPacket(WorldPacket* data, uint32 soundid) { - data->Initialize(SMSG_PLAY_SOUND, 4); + data->Initialize(SMSG_PLAY_SOUND, 4 + 8); *data << uint32(soundid); *data << uint64(0); } diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 064a5d6b7bb..85af475de42 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2753,7 +2753,7 @@ bool WorldObject::InSamePhase(WorldObject const* obj) const void WorldObject::PlayDistanceSound(uint32 sound_id, Player* target /*= NULL*/) { - WorldPacket data(SMSG_PLAY_OBJECT_SOUND, 4+8); + WorldPacket data(SMSG_PLAY_OBJECT_SOUND, 4 + 8); data << uint32(sound_id); data << uint64(GetGUID()); if (target) @@ -2764,7 +2764,7 @@ void WorldObject::PlayDistanceSound(uint32 sound_id, Player* target /*= NULL*/) void WorldObject::PlayDirectSound(uint32 sound_id, Player* target /*= NULL*/) { - WorldPacket data(SMSG_PLAY_SOUND, 4); + WorldPacket data(SMSG_PLAY_SOUND, 4 + 8); data << uint32(sound_id); data << uint64(GetGUID()); if (target) diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index 9e05e4874bc..6da4f6fdade 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -325,7 +325,7 @@ void CreatureTextMgr::SendSound(Creature* source, uint32 sound, ChatMsg msgType, if (!sound || !source) return; - WorldPacket data(SMSG_PLAY_SOUND, 4); + WorldPacket data(SMSG_PLAY_SOUND, 4 + 8); data << uint32(sound); data << uint64(source->GetGUID()); SendNonChatPacket(source, &data, msgType, whisperTarget, range, team, gmOnly); diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index f2ee9a8c971..319151141b7 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -2446,8 +2446,9 @@ public: return false; } - WorldPacket data(SMSG_PLAY_SOUND, 4); + WorldPacket data(SMSG_PLAY_SOUND, 4 + 8); data << uint32(soundId); + data << uint64(handler->GetSession()->GetPlayer()->GetGUID()); sWorld->SendGlobalMessage(&data); handler->PSendSysMessage(LANG_COMMAND_PLAYED_TO_ALL, soundId); |