aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Movement/MotionMaster.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-09-13 17:23:37 +0200
committerShauren <shauren.trinity@gmail.com>2015-09-13 17:23:37 +0200
commit04de58c8d3beb393233071650c65d50967b45266 (patch)
treecac7d1a8bd4b77c65e4e634b2a644134d27318e1 /src/server/game/Movement/MotionMaster.cpp
parent3109ab2da08d094df97724355bff681d7951e576 (diff)
Core/Players: Changed multi-segment taxi paths to fly nearby
flight masters along the way, not directly through them * Taxi cost on multi-segment paths is now charged per segment when it is started Cherry-picked from commit 2056961aae208c5da094f3bf8fbca599b5ebac40 (+fixes)
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
-rw-r--r--src/server/game/Movement/MotionMaster.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 0a4deebbbfc..50ff839e23c 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -534,7 +534,8 @@ void MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode)
if (path < sTaxiPathNodesByPath.size())
{
TC_LOG_DEBUG("misc", "%s taxi to (Path %u node %u)", _owner->GetName().c_str(), path, pathnode);
- FlightPathMovementGenerator* mgen = new FlightPathMovementGenerator(sTaxiPathNodesByPath[path], pathnode);
+ FlightPathMovementGenerator* mgen = new FlightPathMovementGenerator(pathnode);
+ mgen->LoadPath(_owner->ToPlayer());
Mutate(mgen, MOTION_SLOT_CONTROLLED);
}
else