Merge remote-tracking branch 'origin/master' into mmaps

Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
This commit is contained in:
Nay committed 2012-09-10 00:54:29 +01:00
commit 4896a1775e
16 files changed
+150 -51

No files matched your search

@@ -173,17 +173,9 @@ namespace Movement
{
if (_transformForTransport)
{
if (Unit* vehicle = _owner->GetVehicleBase())
{
input.x -= vehicle->GetPositionX();
input.y -= vehicle->GetPositionY();
input.z -= vehicle->GetPositionZMinusOffset();
}
else if (Transport* transport = _owner->GetTransport())
{
float unused = 0.0f;
float unused = 0.0f;
if (TransportBase* transport = _owner.GetDirectTransport())
transport->CalculatePassengerOffset(input.x, input.y, input.z, unused);
}
}
return input;