From 4deeee66bda390d2b35b64aaeb5924dac4170e10 Mon Sep 17 00:00:00 2001 From: treeston Date: Wed, 21 Sep 2016 16:49:19 +0200 Subject: d3214a0 follow-up for code style. --- .../game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp | 2 ++ src/server/game/Movement/Spline/SplineChain.h | 1 + 2 files changed, 3 insertions(+) (limited to 'src') 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(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; -- cgit v1.2.3