1 files changed, 13 insertions, 33 deletions

diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h
index 7828c24d680..7370a6262eb 100644
--- a/src/server/game/Scripting/ScriptSystem.h
+++ b/src/server/game/Scripting/ScriptSystem.h
@@ -21,59 +21,39 @@
 
 #include "Define.h"
 #include "Hash.h"
+#include "WaypointDefines.h"
 #include <unordered_map>
 #include <vector>
 
 class Creature;
 struct SplineChainLink;
 
-#define TEXT_SOURCE_RANGE -1000000                          //the amount of entries each text source has available
-
-struct ScriptPointMove
-{
-    uint32 uiCreatureEntry;
-    uint32 uiPointId;
-    float  fX;
-    float  fY;
-    float  fZ;
-    uint32 uiWaitTime;
-};
-
-typedef std::vector<ScriptPointMove> ScriptPointVector;
+#define TEXT_SOURCE_RANGE -1000000 // the amount of entries each text source has available
 
 class TC_GAME_API SystemMgr
 {
-    private:
-        SystemMgr();
-        ~SystemMgr();
-        SystemMgr(SystemMgr const&) = delete;
-        SystemMgr& operator=(SystemMgr const&) = delete;
-
     public:
         static SystemMgr* instance();
 
-        typedef std::unordered_map<uint32, ScriptPointVector> PointMoveMap;
-
-        //Database
+        // database
         void LoadScriptWaypoints();
         void LoadScriptSplineChains();
 
-        ScriptPointVector const* GetPointMoveList(uint32 creatureEntry) const
-        {
-            PointMoveMap::const_iterator itr = m_mPointMoveMap.find(creatureEntry);
-
-            if (itr == m_mPointMoveMap.end())
-                return nullptr;
-
-            return &itr->second;
-        }
+        WaypointPath const* GetPath(uint32 creatureEntry) const;
 
         std::vector<SplineChainLink> const* GetSplineChain(uint32 entry, uint16 chainId) const;
         std::vector<SplineChainLink> const* GetSplineChain(Creature const* who, uint16 id) const;
 
-    protected:
-        PointMoveMap    m_mPointMoveMap;                    //coordinates for waypoints
+    private:
         typedef std::pair<uint32, uint16> ChainKeyType; // creature entry + chain ID
+
+        SystemMgr();
+        ~SystemMgr();
+
+        SystemMgr(SystemMgr const&) = delete;
+        SystemMgr& operator=(SystemMgr const&) = delete;
+
+        std::unordered_map<uint32, WaypointPath> _waypointStore;
         std::unordered_map<ChainKeyType, std::vector<SplineChainLink>> m_mSplineChainsMap; // spline chains
 };