mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 19:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9580] Add ObjectGuid const& Object::GetObjectGuid() and restore build.

Browse source
This commit is contained in:
VladimirMangos 2010-03-13 17:10:10 +03:00
parent 2bf75e7a10
commit ab7840a591
16 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/MovementHandler.cpp
View file

@ -178,7 +178,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPacket& recv_data)
uint32 flags, time;
recv_data >> flags >> time;
DEBUG_LOG("Guid " UI64FMTD, guid.GetRawValue());
DEBUG_LOG("Guid: %s", guid.GetString().c_str());
DEBUG_LOG("Flags %u, time %u", flags, time/IN_MILISECONDS);
Unit *mover = _player->m_mover;
@ -187,7 +187,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPacket& recv_data)
if(!plMover || !plMover->IsBeingTeleportedNear())
return;
if(guid.GetRawValue() != plMover->GetGUID())
if(guid != plMover->GetObjectGuid())
return;
plMover->SetSemaphoreTeleportNear(false);
@ -373,7 +373,7 @@ void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recv_data)
recv_data >> newspeed;
// now can skip not our packet
if(_player->GetGUID() != guid.GetRawValue())
if(_player->GetObjectGuid() != guid)
{
recv_data.rpos(recv_data.wpos()); // prevent warnings spam
return;
@ -455,7 +455,7 @@ void WorldSession::HandleMoveNotActiveMover(WorldPacket &recv_data)
recv_data >> old_mover_guid.ReadAsPacked();
recv_data >> mi;
if(_player->m_mover->GetGUID() == old_mover_guid.GetRawValue())
if(_player->m_mover->GetObjectGuid() == old_mover_guid)
{
sLog.outError("HandleMoveNotActiveMover: incorrect mover guid: mover is " I64FMT " and should be " I64FMT " instead of " UI64FMTD, _player->m_mover->GetGUID(), _player->GetGUID(), old_mover_guid.GetRawValue());
recv_data.rpos(recv_data.wpos()); // prevent warnings spam