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/server/game/Entities | |
| parent | ca3961f9875608bd02ba42445f165a02002444f8 (diff) | |
Core/Misc: Fix merge fail
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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) |