Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Fix merge fail

Browse Source
This commit is contained in:
Vincent-Michael
2014-09-13 22:59:28 +02:00
parent ca3961f987
commit 0591ee53b5
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Battlefield/Battlefield.cpp
View File

@@ -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);

2
src/server/game/Battlegrounds/BattlegroundMgr.cpp
View File

@@ -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);
}

4
src/server/game/Entities/Object/Object.cpp
View File

@@ -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)

2
src/server/game/Texts/CreatureTextMgr.cpp
View File

@@ -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);

3
src/server/scripts/Commands/cs_misc.cpp
View File

@@ -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);