diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Movement/Spline/MoveSpline.h | 2 | ||||
| -rw-r--r-- | src/server/game/Movement/Spline/MoveSplineFlag.h | 3 | ||||
| -rw-r--r-- | src/server/game/Movement/Spline/MovementPacketBuilder.cpp | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 415992b1e0c..3e3a39c16a5 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -517,7 +517,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 04dbc4e5c33..c2a6b58c448 100644 --- a/src/server/game/Movement/Spline/MoveSpline.h +++ b/src/server/game/Movement/Spline/MoveSpline.h @@ -126,7 +126,7 @@ namespace Movement int32 currentPathIdx() const; bool HasAnimation() const { return splineflags.animation; } - AnimationTier GetAnimation() const { return static_cast<AnimationTier>(splineflags.animId); } + AnimationTier GetAnimationTier() const { return static_cast<AnimationTier>(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 e385e792d90..7567e504c58 100644 --- a/src/server/game/Movement/Spline/MoveSplineFlag.h +++ b/src/server/game/Movement/Spline/MoveSplineFlag.h @@ -80,7 +80,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); } @@ -103,7 +102,7 @@ namespace Movement void EnableTransportEnter() { raw() = (raw() & ~TransportExit) | TransportEnter; } void EnableTransportExit() { raw() = (raw() & ~TransportEnter) | TransportExit; } - uint8 animId : 8; + uint8 animTier : 8; bool done : 1; bool falling : 1; bool no_spline : 1; diff --git a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp index d5aad6c2625..63eb2ebed2c 100644 --- a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp +++ b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp @@ -72,7 +72,7 @@ namespace Movement if (splineflags.animation) { - data << splineflags.getAnimationId(); + data << splineflags.animTier; data << move_spline.effect_start_time; } |