diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Movement/Spline/MoveSpline.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Movement/Spline/MoveSplineFlag.h | 10 | ||||
| -rw-r--r-- | src/server/game/Movement/Spline/MovementUtil.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/MovementPackets.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp index 9f18a88747e..be2c5432cce 100644 --- a/src/server/game/Movement/Spline/MoveSpline.cpp +++ b/src/server/game/Movement/Spline/MoveSpline.cpp @@ -178,7 +178,7 @@ void MoveSpline::Initialize(MoveSplineInitArgs const& args) // init parabolic / animation // spline initialized, duration known and i able to compute parabolic acceleration - if (args.flags & (MoveSplineFlag::Parabolic | MoveSplineFlag::Animation | MoveSplineFlag::Unknown6)) + if (args.flags & (MoveSplineFlag::Parabolic | MoveSplineFlag::Animation | MoveSplineFlag::FadeObject)) { effect_start_time = Duration() * args.time_perc; if (args.flags.parabolic && effect_start_time < Duration()) diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h index 94d0b7bc13f..7925c8875c5 100644 --- a/src/server/game/Movement/Spline/MoveSplineFlag.h +++ b/src/server/game/Movement/Spline/MoveSplineFlag.h @@ -56,7 +56,7 @@ namespace Movement Unknown5 = 0x01000000, // NOT VERIFIED Animation = 0x02000000, // Plays animation after some time passed Parabolic = 0x04000000, // Affects elevation computation, can't be combined with Falling flag - Unknown6 = 0x08000000, // NOT VERIFIED + FadeObject = 0x08000000, Unknown7 = 0x10000000, // NOT VERIFIED Unknown8 = 0x20000000, // NOT VERIFIED Unknown9 = 0x40000000, // NOT VERIFIED @@ -68,7 +68,7 @@ namespace Movement // flags that shouldn't be appended into SMSG_MONSTER_MOVE\SMSG_MONSTER_MOVE_TRANSPORT packet, should be more probably Mask_No_Monster_Move = Mask_Animations | Done, // Unused, not suported flags - Mask_Unused = No_Spline|Enter_Cycle|Frozen|Unknown0|Unknown1|Unknown2|Unknown3|Unknown4|Unknown5|Unknown6|Unknown7|Unknown8|Unknown9|Unknown10 + Mask_Unused = No_Spline|Enter_Cycle|Frozen|Unknown0|Unknown1|Unknown2|Unknown3|Unknown4|Unknown5|FadeObject|Unknown7|Unknown8|Unknown9|Unknown10 }; inline uint32& raw() { return (uint32&)*this; } @@ -95,8 +95,8 @@ namespace Movement void operator &= (uint32 f) { raw() &= f; } void operator |= (uint32 f) { raw() |= f; } - void EnableAnimation(uint8 anim) { raw() = (raw() & ~(Mask_Animations | Falling | Parabolic | FallingSlow)) | Animation | (anim & Mask_Animations); } - void EnableParabolic() { raw() = (raw() & ~(Mask_Animations | Falling | Animation | FallingSlow)) | Parabolic; } + void EnableAnimation(uint8 anim) { raw() = (raw() & ~(Mask_Animations | Falling | Parabolic | FallingSlow | FadeObject)) | Animation | (anim & Mask_Animations); } + void EnableParabolic() { raw() = (raw() & ~(Mask_Animations | Falling | Animation | FallingSlow | FadeObject)) | Parabolic; } void EnableFlying() { raw() = (raw() & ~(Falling)) | Flying; } void EnableFalling() { raw() = (raw() & ~(Mask_Animations | Parabolic | Animation | Flying)) | Falling; } void EnableCatmullRom() { raw() = (raw() & ~SmoothGroundPath) | Catmullrom; } @@ -128,7 +128,7 @@ namespace Movement bool unknown5 : 1; bool animation : 1; bool parabolic : 1; - bool unknown6 : 1; + bool fadeObject : 1; bool unknown7 : 1; bool unknown8 : 1; bool unknown9 : 1; diff --git a/src/server/game/Movement/Spline/MovementUtil.cpp b/src/server/game/Movement/Spline/MovementUtil.cpp index 745802f0138..f1e685518a2 100644 --- a/src/server/game/Movement/Spline/MovementUtil.cpp +++ b/src/server/game/Movement/Spline/MovementUtil.cpp @@ -168,7 +168,7 @@ namespace Movement STRINGIZE(Unknown5 ), // 0x01000000 STRINGIZE(Animation ), // 0x02000000 // Animationid (0...3), Uint32 Time, Not Compartible With Trajectory And Fall Movement STRINGIZE(Parabolic ), // 0x04000000 // Not Compartible With Fall Movement - STRINGIZE(Unknown6 ), // 0x08000000 + STRINGIZE(FadeObject ), // 0x08000000 STRINGIZE(Unknown7 ), // 0x10000000 STRINGIZE(Unknown8 ), // 0x20000000 STRINGIZE(Unknown9 ), // 0x40000000 diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp index 5ac0e9ec3e7..564df7e2ca5 100644 --- a/src/server/game/Server/Packets/MovementPackets.cpp +++ b/src/server/game/Server/Packets/MovementPackets.cpp @@ -378,7 +378,7 @@ void WorldPackets::Movement::MonsterMove::InitializeSplineData(::Movement::MoveS movementSpline.SpecialTime = moveSpline.effect_start_time; } - if (splineFlags.unknown6) + if (splineFlags.fadeObject) movementSpline.SpecialTime = moveSpline.effect_start_time; ::Movement::Spline<int32> const& spline = moveSpline.spline; |