*Fix build.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-01-12 11:30:52 -06:00
parent 90f30abd86
commit 5f3418c80c
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -197,12 +197,12 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
return; return;
// Handle possessed unit movement separately // Handle possessed unit movement separately
Unit* pos_unit = GetPlayer()->GetCharm(); /*Unit* pos_unit = GetPlayer()->GetCharm();
if (pos_unit && pos_unit->isPossessed()) // can be charmed but not possessed if (pos_unit && pos_unit->isPossessed()) // can be charmed but not possessed
{ {
HandlePossessedMovement(recv_data, movementInfo, movementInfo.flags); HandlePossessedMovement(recv_data, movementInfo, movementInfo.flags);
return; return;
} }*/
if (GetPlayer()->GetDontMove()) if (GetPlayer()->GetDontMove())
return; return;
+1 -1
View File
@@ -7183,7 +7183,7 @@ Unit* Unit::GetCharm() const
sLog.outError("Unit::GetCharm: Charmed creature %u not exist.",GUID_LOPART(charm_guid)); sLog.outError("Unit::GetCharm: Charmed creature %u not exist.",GUID_LOPART(charm_guid));
const_cast<Unit*>(this)->SetCharm(0); const_cast<Unit*>(this)->SetCharm(0);
const_cast<Unit*>(this)->SetMover(0); //const_cast<Unit*>(this)->SetMover(0);
} }
return NULL; return NULL;