josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Revert some (apparently unreliable) asserts.. they're -almost- never false, but 'almost' isn't good enough.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-11-04 17:10:43 -08:00
parent 558ceeb929
commit 2adb1b8d4c
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/MovementHandler.cpp
+11 -8
View File
@@ -230,11 +230,7 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
Unit *mover = _player->m_mover; Unit *mover = _player->m_mover;
// vehicles become the mover, so mover->GetVehicle() should never be true assert(mover != NULL); // there must always be a mover
// also, if the mover is a vehicle, it should never be on a transport
assert(mover);
assert(!mover->GetVehicle());
assert((mover->IsVehicle() && !mover->GetTransport()) || !mover->IsVehicle());
Player *plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL; Player *plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL;
@@ -283,7 +279,7 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
} }
// if we boarded a transport, add us to it // if we boarded a transport, add us to it
if (plMover && !plMover->GetTransport() && !mover->IsVehicle()) if (plMover && !plMover->GetTransport())
{ {
// elevators also cause the client to send MOVEMENTFLAG_ONTRANSPORT - just unmount if the guid can be found in the transport list // elevators also cause the client to send MOVEMENTFLAG_ONTRANSPORT - just unmount if the guid can be found in the transport list
for (MapManager::TransportSet::const_iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter) for (MapManager::TransportSet::const_iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter)
@@ -297,10 +293,10 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
} }
} }
if (!mover->GetTransport() && !mover->IsVehicle()) if (!mover->GetTransport() && !mover->GetVehicle())
movementInfo.flags &= ~MOVEMENTFLAG_ONTRANSPORT; movementInfo.flags &= ~MOVEMENTFLAG_ONTRANSPORT;
} }
else if (plMover && plMover->m_transport) // if we were on a transport, leave else if (plMover && plMover->GetTransport()) // if we were on a transport, leave
{ {
plMover->m_transport->RemovePassenger(plMover); plMover->m_transport->RemovePassenger(plMover);
plMover->m_transport = NULL; plMover->m_transport = NULL;
@@ -333,6 +329,13 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
mover->m_movementInfo = movementInfo; mover->m_movementInfo = movementInfo;
// this is almost never true (not sure why it is sometimes, but it is), normally use mover->IsVehicle()
if (mover->GetVehicle())
{
mover->SetOrientation(movementInfo.o);
return;
}
if (plMover) // nothing is charmed, or player charmed if (plMover) // nothing is charmed, or player charmed
{ {
plMover->SetPosition(movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o); plMover->SetPosition(movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);