araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-18 14:10:18 -04: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
src/server/game/Entities/Object/Object.cpp
+2 -2
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)