diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-09-21 16:49:19 +0200 |
|---|---|---|
| committer | treeston <treeston.mmoc@gmail.com> | 2016-09-21 16:49:19 +0200 |
| commit | 4deeee66bda390d2b35b64aaeb5924dac4170e10 (patch) | |
| tree | 33a123d0d06c76028ee9c0bb311b397e12281f24 /src | |
| parent | d3214a0012cf93a5e66d1dc405ac90c4abc1b8c3 (diff) | |
d3214a0 follow-up for code style.
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Movement/Spline/SplineChain.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp index 18ad47d709e..43b4c6b029e 100644 --- a/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp @@ -142,10 +142,12 @@ SplineChainResumeInfo SplineChainMovementGenerator::GetResumeInfo(Unit const* me /* static */ void SplineChainMovementGenerator::GetResumeInfo(Unit const* me, SplineChainResumeInfo& info) { if (MovementGenerator const* activeGen = me->GetMotionMaster()->GetMotionSlot(MOTION_SLOT_ACTIVE)) + { if (activeGen->GetMovementGeneratorType() == SPLINE_CHAIN_MOTION_TYPE) { info = reinterpret_cast<SplineChainMovementGenerator const*>(activeGen)->GetResumeInfo(me); return; } + } info.Chain = nullptr; } diff --git a/src/server/game/Movement/Spline/SplineChain.h b/src/server/game/Movement/Spline/SplineChain.h index 56de9d2aa40..33d816712b7 100644 --- a/src/server/game/Movement/Spline/SplineChain.h +++ b/src/server/game/Movement/Spline/SplineChain.h @@ -37,6 +37,7 @@ struct TC_GAME_API SplineChainResumeInfo SplineChainResumeInfo(uint32 id, SplineChain const* chain, bool walk, uint8 splineIndex, uint8 wpIndex, uint32 msToNext) : PointID(id), Chain(chain), IsWalkMode(walk), SplineIndex(splineIndex), PointIndex(wpIndex), TimeToNext(msToNext) { } bool Empty() const { return Chain == nullptr; } + void Clear() { Chain = nullptr; } uint32 PointID; SplineChain const* Chain; bool IsWalkMode; |
