aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Movement/MotionMaster.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-05-20 00:09:37 +0200
committerShauren <shauren.trinity@gmail.com>2017-05-20 00:09:37 +0200
commitf2039981e086e5db6c7ad9a45a11f13392c5fbd9 (patch)
tree65cfae5f95d8fef899559bda00a68aab14ff043c /src/server/game/Movement/MotionMaster.cpp
parent506de194954a52452cba69fc890482edf0afd0b2 (diff)
Core/Game: Include cleanup, part 3
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
-rw-r--r--src/server/game/Movement/MotionMaster.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 61eb874d882..9618146160e 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -459,12 +459,6 @@ void MotionMaster::MoveCirclePath(float x, float y, float z, float radius, bool
void MotionMaster::MoveSmoothPath(uint32 pointId, G3D::Vector3 const* pathPoints, size_t pathSize, bool walk, bool fly)
{
- Movement::PointsArray path(pathPoints, pathPoints + pathSize);
- MoveSmoothPath(pointId, path, walk, fly);
-}
-
-void MotionMaster::MoveSmoothPath(uint32 pointId, Movement::PointsArray const& path, bool walk, bool fly)
-{
Movement::MoveSplineInit init(_owner);
if (fly)
{
@@ -472,6 +466,7 @@ void MotionMaster::MoveSmoothPath(uint32 pointId, Movement::PointsArray const& p
init.SetUncompressed();
}
+ Movement::PointsArray path(pathPoints, pathPoints + pathSize);
init.MovebyPath(path);
init.SetSmooth();
init.SetWalk(walk);
@@ -502,7 +497,7 @@ void MotionMaster::MoveAlongSplineChain(uint32 pointId, uint16 dbChainId, bool w
MoveAlongSplineChain(pointId, *chain, walk);
}
-void MotionMaster::MoveAlongSplineChain(uint32 pointId, SplineChain const& chain, bool walk)
+void MotionMaster::MoveAlongSplineChain(uint32 pointId, std::vector<SplineChainLink> const& chain, bool walk)
{
Mutate(new SplineChainMovementGenerator(pointId, chain, walk), MOTION_SLOT_ACTIVE);
}