Core/Waypoints: Drop waypoint_scripts table (#29437)

2 files changed, 3 insertions, 11 deletions

diff --git a/src/server/game/Movement/Waypoints/WaypointDefines.h b/src/server/game/Movement/Waypoints/WaypointDefines.h
index 70ab08f2958..119219dd3d4 100644
--- a/src/server/game/Movement/Waypoints/WaypointDefines.h
+++ b/src/server/game/Movement/Waypoints/WaypointDefines.h
@@ -34,7 +34,7 @@ enum WaypointMoveType
 
 struct WaypointNode
 {
-    WaypointNode() : id(0), x(0.f), y(0.f), z(0.f), delay(0), eventId(0), moveType(WAYPOINT_MOVE_TYPE_RUN), eventChance(0) { }
+    WaypointNode() : id(0), x(0.f), y(0.f), z(0.f), delay(0), moveType(WAYPOINT_MOVE_TYPE_RUN) { }
     WaypointNode(uint32 _id, float _x, float _y, float _z, Optional<float> _orientation = { }, uint32 _delay = 0)
     {
         id = _id;
@@ -43,18 +43,14 @@ struct WaypointNode
         z = _z;
         orientation = _orientation;
         delay = _delay;
-        eventId = 0;
         moveType = WAYPOINT_MOVE_TYPE_WALK;
-        eventChance = 100;
     }
 
     uint32 id;
     float x, y, z;
     Optional<float> orientation;
     uint32 delay;
-    uint32 eventId;
     uint32 moveType;
-    uint8 eventChance;
 };
 
 struct WaypointPath
diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp
index 07ccd574ffc..ab018e66233 100644
--- a/src/server/game/Movement/Waypoints/WaypointManager.cpp
+++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp
@@ -24,8 +24,8 @@ void WaypointMgr::Load()
 {
     uint32 oldMSTime = getMSTime();
 
-    //                                                0    1         2           3          4            5           6        7      8           9
-    QueryResult result = WorldDatabase.Query("SELECT id, point, position_x, position_y, position_z, orientation, move_type, delay, action, action_chance FROM waypoint_data ORDER BY id, point");
+    //                                                0    1         2           3          4            5           6        7
+    QueryResult result = WorldDatabase.Query("SELECT id, point, position_x, position_y, position_z, orientation, move_type, delay FROM waypoint_data ORDER BY id, point");
 
     if (!result)
     {
@@ -64,8 +64,6 @@ void WaypointMgr::Load()
         }
 
         waypoint.delay = fields[7].GetUInt32();
-        waypoint.eventId = fields[8].GetUInt32();
-        waypoint.eventChance = fields[9].GetInt16();
 
         WaypointPath& path = _waypointStore[pathId];
         path.id = pathId;
@@ -123,8 +121,6 @@ void WaypointMgr::ReloadPath(uint32 id)
         }
 
         waypoint.delay = fields[6].GetUInt32();
-        waypoint.eventId = fields[7].GetUInt32();
-        waypoint.eventChance = fields[8].GetUInt8();
 
         values.push_back(std::move(waypoint));
     }