From a2c1b699e6e4d30c752b65241bc23191920a86fd Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 7 Jun 2022 16:02:51 +0200 Subject: Core/Transports: Path generation rewrite v2 * No TaxiPathNode row is skipped anymore (events/delays on first node now work) * Fixed transport animation synchronization with client * Fixed stoppable transports randomly resuming their path after relogging Closes #27985 --- src/server/game/Scripting/ScriptMgr.cpp | 4 ++-- src/server/game/Scripting/ScriptMgr.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/game/Scripting') diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 35aaf0829cb..795b8e997eb 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1921,10 +1921,10 @@ void ScriptMgr::OnTransportUpdate(Transport* transport, uint32 diff) tmpscript->OnUpdate(transport, diff); } -void ScriptMgr::OnRelocate(Transport* transport, uint32 waypointId, uint32 mapId, float x, float y, float z) +void ScriptMgr::OnRelocate(Transport* transport, uint32 mapId, float x, float y, float z) { GET_SCRIPT(TransportScript, transport->GetScriptId(), tmpscript); - tmpscript->OnRelocate(transport, waypointId, mapId, x, y, z); + tmpscript->OnRelocate(transport, mapId, x, y, z); } void ScriptMgr::OnStartup() diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index bca92bbe3af..32ecfb431c7 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -677,7 +677,7 @@ class TC_GAME_API TransportScript : public ScriptObject, public UpdatableScript< virtual void OnRemovePassenger(Transport* /*transport*/, Player* /*player*/) { } // Called when a transport moves. - virtual void OnRelocate(Transport* /*transport*/, uint32 /*waypointId*/, uint32 /*mapId*/, float /*x*/, float /*y*/, float /*z*/) { } + virtual void OnRelocate(Transport* /*transport*/, uint32 /*mapId*/, float /*x*/, float /*y*/, float /*z*/) { } }; class TC_GAME_API AchievementScript : public ScriptObject @@ -1180,7 +1180,7 @@ class TC_GAME_API ScriptMgr void OnAddCreaturePassenger(Transport* transport, Creature* creature); void OnRemovePassenger(Transport* transport, Player* player); void OnTransportUpdate(Transport* transport, uint32 diff); - void OnRelocate(Transport* transport, uint32 waypointId, uint32 mapId, float x, float y, float z); + void OnRelocate(Transport* transport, uint32 mapId, float x, float y, float z); public: /* AchievementScript */ -- cgit v1.2.3