Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps

Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
This commit is contained in:
Vincent_Michael committed 2013-01-05 16:55:17 +01:00
commit 24e0eb1812
42 files changed
+606 -99

No files matched your search

@@ -175,9 +175,11 @@ namespace Movement
{
if (_transformForTransport)
{
float unused = 0.0f;
if (TransportBase* transport = _owner->GetDirectTransport())
{
float unused = 0.0f; // need reference
transport->CalculatePassengerOffset(input.x, input.y, input.z, unused);
}
}
return input;