feature(SmartAI/Movement) - Unify waypoint systems (#23251)

src/server/game/Movement/Waypoints/WaypointMgr.cpp

@@ -30,9 +30,6 @@ WaypointMgr::~WaypointMgr()
 {
     for (WaypointPathContainer::iterator itr = _waypointStore.begin(); itr != _waypointStore.end(); ++itr)
     {
-        for (WaypointPath::const_iterator it = itr->second.begin(); it != itr->second.end(); ++it)
-            delete *it;
-
         itr->second.clear();
     }
 
@@ -64,7 +61,7 @@ void WaypointMgr::Load()
     do
     {
         Field* fields = result->Fetch();
-        WaypointData* wp = new WaypointData();
+        WaypointData data;
 
         uint32 pathId = fields[0].Get<uint32>();
         WaypointPath& path = _waypointStore[pathId];
@@ -79,28 +76,40 @@ void WaypointMgr::Load()
         Acore::NormalizeMapCoord(x);
         Acore::NormalizeMapCoord(y);
 
-        wp->id = fields[1].Get<uint32>();
-        wp->x = x;
-        wp->y = y;
-        wp->z = z;
-        wp->orientation = o;
-        wp->move_type = fields[6].Get<uint32>();
+        data.id = fields[1].Get<uint32>();
+        data.x = x;
+        data.y = y;
+        data.z = z;
+        data.orientation = o;
+        data.move_type = fields[6].Get<uint32>();
 
-        if (wp->move_type >= WAYPOINT_MOVE_TYPE_MAX)
+        if (data.move_type >= WAYPOINT_MOVE_TYPE_MAX)
         {
             //LOG_ERROR("sql.sql", "Waypoint {} in waypoint_data has invalid move_type, ignoring", wp->id);
-            delete wp;
             continue;
         }
 
-        wp->delay = fields[7].Get<uint32>();
-        wp->event_id = fields[8].Get<uint32>();
-        wp->event_chance = fields[9].Get<int16>();
+        data.delay = fields[7].Get<uint32>();
+        data.event_id = fields[8].Get<uint32>();
+        data.event_chance = fields[9].Get<int16>();
 
-        path.push_back(wp);
+        path.emplace(data.id, data);
         ++count;
     } while (result->NextRow());
 
+    for (auto itr = _waypointStore.begin(); itr != _waypointStore.end(); )
+    {
+        uint32 first = itr->second.begin()->first;
+        uint32 last = itr->second.rbegin()->first;
+        if (last - first + 1 != itr->second.size())
+        {
+            LOG_ERROR("sql.sql", "Waypoint {} in waypoint_data has non-contiguous pointids, skipping", itr->first);
+            itr = _waypointStore.erase(itr);
+        }
+        else
+            ++itr;
+    }
+
     LOG_INFO("server.loading", ">> Loaded {} waypoints in {} ms", count, GetMSTimeDiffToNow(oldMSTime));
     LOG_INFO("server.loading", " ");
 }
@@ -110,9 +119,6 @@ void WaypointMgr::ReloadPath(uint32 id)
     WaypointPathContainer::iterator itr = _waypointStore.find(id);
     if (itr != _waypointStore.end())
     {
-        for (WaypointPath::const_iterator it = itr->second.begin(); it != itr->second.end(); ++it)
-            delete *it;
-
         _waypointStore.erase(itr);
     }
 
@@ -130,7 +136,7 @@ void WaypointMgr::ReloadPath(uint32 id)
     do
     {
         Field* fields = result->Fetch();
-        WaypointData* wp = new WaypointData();
+        WaypointData data;
 
         float x = fields[1].Get<float>();
         float y = fields[2].Get<float>();
@@ -142,24 +148,23 @@ void WaypointMgr::ReloadPath(uint32 id)
         Acore::NormalizeMapCoord(x);
         Acore::NormalizeMapCoord(y);
 
-        wp->id = fields[0].Get<uint32>();
-        wp->x = x;
-        wp->y = y;
-        wp->z = z;
-        wp->orientation = o;
-        wp->move_type = fields[5].Get<uint32>();
+        data.id = fields[0].Get<uint32>();
+        data.x = x;
+        data.y = y;
+        data.z = z;
+        data.orientation = o;
+        data.move_type = fields[5].Get<uint32>();
 
-        if (wp->move_type >= WAYPOINT_MOVE_TYPE_MAX)
+        if (data.move_type >= WAYPOINT_MOVE_TYPE_MAX)
         {
             //LOG_ERROR("sql.sql", "Waypoint {} in waypoint_data has invalid move_type, ignoring", wp->id);
-            delete wp;
             continue;
         }
 
-        wp->delay = fields[6].Get<uint32>();
-        wp->event_id = fields[7].Get<uint32>();
-        wp->event_chance = fields[8].Get<uint8>();
+        data.delay = fields[6].Get<uint32>();
+        data.event_id = fields[7].Get<uint32>();
+        data.event_chance = fields[8].Get<uint8>();
 
-        path.push_back(wp);
+        path.emplace(data.id, data);
     } while (result->NextRow());
 }

src/server/game/Movement/Waypoints/WaypointMgr.h

@@ -22,6 +22,7 @@
 #include <optional>
 #include <unordered_map>
 #include <vector>
+#include <map>
 
 enum WaypointMoveType
 {
@@ -39,12 +40,12 @@ struct WaypointData
     float x, y, z;
     std::optional<float> orientation;
     uint32 delay;
-    uint32 event_id;
-    uint32 move_type;
-    uint8 event_chance;
+    uint32 event_id = 0;
+    uint32 move_type = 0;
+    uint8 event_chance = 0;
 };
 
-typedef std::vector<WaypointData*> WaypointPath;
+typedef std::map<uint32, WaypointData> WaypointPath;
 typedef std::unordered_map<uint32, WaypointPath> WaypointPathContainer;
 
 class WaypointMgr