aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Commands
diff options
context:
space:
mode:
authorccrs <ccrs@users.noreply.github.com>2017-11-06 22:19:23 +0100
committerfunjoker <funjoker109@gmail.com>2021-01-29 19:23:53 +0100
commitbf12bae46746149d870cd3e52ccd610f0a975047 (patch)
tree57b5f138b6d5dbefa8ec96aa14dbba150a1d0979 /src/server/scripts/Commands
parent69d6b4241d8d9c49c135aec3a50fdafcca250a5f (diff)
Core/Misc: waypoint movement
- Creature: update current waypoint to store nodeId and pathId - MotionMaster: change variable type on GetMotionSlotType and GetMotionSlot to keep consistency and prevent errors (ASSERT is now no longer needed) - UnitAI: add new waypoint hooks WaypointPathStarted and WaypointPathEnded - SAI: handle WAYPOINT related events if creature is no escorting * SMART_EVENT_WAYPOINT_RESUMED still not implemented for no escorting TODO: the new hooks can save, now duplicated, logic on EscortAI and SAI closes #20777 updates #20310 updates 21bd52cb99 (cherry picked from commit e10d7dd45cfc073c791cd5e5f3f964d14b37df3d)
Diffstat (limited to 'src/server/scripts/Commands')
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp4
-rw-r--r--src/server/scripts/Commands/cs_wp.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index c7563bf298d..b70687f67bb 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -2182,9 +2182,9 @@ public:
float x, y, z;
motionMaster->GetDestination(x, y, z);
- for (uint8 i = 0; i < MAX_MOTION_SLOT; ++i)
+ for (uint8 itr = 0; itr < MAX_MOTION_SLOT; ++itr)
{
- MovementGenerator* movementGenerator = motionMaster->GetMotionSlot(i);
+ MovementGenerator* movementGenerator = motionMaster->GetMotionSlot(MovementSlot(itr));
if (!movementGenerator)
{
handler->SendSysMessage("Empty");
diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp
index 69dc1f8c51a..ad3ccf37669 100644
--- a/src/server/scripts/Commands/cs_wp.cpp
+++ b/src/server/scripts/Commands/cs_wp.cpp
@@ -270,7 +270,7 @@ public:
stmt->setUInt64(0, guidLow);
WorldDatabase.Execute(stmt);
- target->UpdateWaypointID(0);
+ target->UpdateCurrentWaypointInfo(0, 0);
stmt = WorldDatabase.GetPreparedStatement(WORLD_UPD_CREATURE_MOVEMENT_TYPE);
stmt->setUInt8(0, uint8(IDLE_MOTION_TYPE));