aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Movement/MotionMaster.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-04-04 16:17:09 +0200
committerOvahlord <dreadkiller@gmx.de>2024-05-28 16:33:23 +0200
commitfbe4fee3c374afe16135a6c42b312a7b39323a48 (patch)
tree6a11cddb713b2abef4c97e7017a8b0b77bf31034 /src/server/game/Movement/MotionMaster.cpp
parent9f885dae462a234992ce2c4eade4909b68185536 (diff)
Core/Movement: Allow overriding speed for taxi movement generator
(cherry picked from commit 038f995ad6ce6a26f71367cae3eb7ae107527a18)
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
-rw-r--r--src/server/game/Movement/MotionMaster.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 212d2406ea8..5fadcff5f58 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -1079,7 +1079,7 @@ void MotionMaster::MoveSeekAssistanceDistract(uint32 time)
TC_LOG_ERROR("movement.motionmaster", "MotionMaster::MoveSeekAssistanceDistract: '{}', attempted to call distract assistance.", _owner->GetGUID());
}
-void MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode)
+void MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode, Optional<float> speed /*= {}*/)
{
if (_owner->GetTypeId() == TYPEID_PLAYER)
{
@@ -1091,7 +1091,7 @@ void MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode)
bool hasExisting = HasMovementGenerator([](MovementGenerator const* gen) { return gen->GetMovementGeneratorType() == FLIGHT_MOTION_TYPE; });
ASSERT(!hasExisting, "Duplicate flight path movement generator");
- FlightPathMovementGenerator* movement = new FlightPathMovementGenerator();
+ FlightPathMovementGenerator* movement = new FlightPathMovementGenerator(speed);
movement->LoadPath(_owner->ToPlayer(), pathnode);
Add(movement);
}