Core/Movement: Use spline id generator

3 files changed, 6 insertions, 3 deletions

diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp
index 96b925928a4..8d0e67b769f 100644
--- a/src/server/game/Movement/Spline/MoveSplineInit.cpp
+++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp
@@ -119,6 +119,7 @@ namespace Movement
 
     MoveSplineInit::MoveSplineInit(Unit& m) : unit(m)
     {
+        args.splineId = splineIdGen.NewId();
         // Elevators also use MOVEMENTFLAG_ONTRANSPORT but we do not keep track of their position changes
         args.TransformForTransport = unit.GetTransGUID();
         // mix existing state into new
diff --git a/src/server/game/Movement/Spline/MovementTypedefs.h b/src/server/game/Movement/Spline/MovementTypedefs.h
index 01c8a5b7e7b..51679260ebb 100644
--- a/src/server/game/Movement/Spline/MovementTypedefs.h
+++ b/src/server/game/Movement/Spline/MovementTypedefs.h
@@ -54,7 +54,7 @@ namespace Movement
     class counter
     {
     public:
-        counter() { init();}
+        counter() { init(); }
 
         void Increase()
         {
@@ -64,8 +64,8 @@ namespace Movement
                 ++m_counter;
         }
 
-        T NewId() { Increase(); return m_counter;}
-        T getCurrent() const { return m_counter;}
+        T NewId() { Increase(); return m_counter; }
+        T getCurrent() const { return m_counter; }
 
     private:
         void init() { m_counter = 0; }
@@ -76,6 +76,7 @@ namespace Movement
 
     extern double gravity;
     extern float computeFallElevation(float t_passed, bool isSafeFall, float start_velocity);
+    extern UInt32Counter splineIdGen;
 }
 
 #endif // TRINITYSERVER_TYPEDEFS_H
diff --git a/src/server/game/Movement/Spline/MovementUtil.cpp b/src/server/game/Movement/Spline/MovementUtil.cpp
index d0582baa7f9..63790c8c83f 100644
--- a/src/server/game/Movement/Spline/MovementUtil.cpp
+++ b/src/server/game/Movement/Spline/MovementUtil.cpp
@@ -23,6 +23,7 @@
 namespace Movement
 {
     double gravity = 19.29110527038574;
+    UInt32Counter splineIdGen;
 
     /// Velocity bounds that makes fall speed limited
     float terminalVelocity = 60.148003f;