diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6a01e12a5d..2957654620 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -565,7 +565,7 @@ void Unit::UpdateSplineMovement(uint32 t_diff) DisableSpline(); if (movespline->HasAnimation()) - SetAnimationTier(movespline->GetAnimation()); + SetAnimationTier(movespline->GetAnimationTier()); } UpdateSplinePosition(); diff --git a/src/server/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h index 1d1d8b3d47..b62e03d507 100644 --- a/src/server/game/Movement/Spline/MoveSpline.h +++ b/src/server/game/Movement/Spline/MoveSpline.h @@ -141,7 +141,7 @@ namespace Movement bool HasStarted() const { return time_passed > 0; } bool HasAnimation() const { return splineflags.animation; } - AnimationTier GetAnimation() const { return static_cast(splineflags.animId); } + AnimationTier GetAnimationTier() const { return static_cast(splineflags.animTier); } bool onTransport; std::string ToString() const; diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h index c57d45dbb7..f06442ee17 100644 --- a/src/server/game/Movement/Spline/MoveSplineFlag.h +++ b/src/server/game/Movement/Spline/MoveSplineFlag.h @@ -83,7 +83,6 @@ namespace Movement bool isLinear() const { return !isSmooth(); } bool isFacing() const { return (raw() & Mask_Final_Facing) != 0; } - uint8 getAnimationId() const { return animId; } bool hasAllFlags(uint32 f) const { return (raw() & f) == f; } bool hasFlag(uint32 f) const { return (raw() & f) != 0; } uint32 operator & (uint32 f) const { return (raw() & f); } @@ -106,7 +105,7 @@ namespace Movement void EnableTransportEnter() { raw() = (raw() & ~TransportExit) | TransportEnter; } void EnableTransportExit() { raw() = (raw() & ~TransportEnter) | TransportExit; } - uint8 animId : 3; + uint8 animTier : 3; bool unknown0 : 1; bool fallingSlow : 1; bool done : 1; diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp index b954ec3879..cf79b995fb 100644 --- a/src/server/game/Server/Packets/MovementPackets.cpp +++ b/src/server/game/Server/Packets/MovementPackets.cpp @@ -400,7 +400,7 @@ void WorldPackets::Movement::MonsterMove::InitializeSplineData(::Movement::MoveS if (splineFlags.animation) { movementSpline.Animation = boost::in_place(); - movementSpline.Animation->AnimTier = splineFlags.getAnimationId(); + movementSpline.Animation->AnimTier = splineFlags.animTier; movementSpline.Animation->TierTransStartTime = moveSpline.effect_start_time; }