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

Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp

1 files changed, 3 insertions, 1 deletions

diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp
index e2a18d21ff2..1e4d4950ea0 100644
--- a/src/server/game/Movement/Spline/MoveSplineInit.cpp
+++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp
@@ -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;