mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-25 13:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[m] More structure updates

Browse source
This commit is contained in:
Antz 2020-02-19 11:17:55 +00:00
parent 5db632ef5b
commit 15eff7b970
No known key found for this signature in database
GPG key ID: 0DF907270598C85F
1 changed files with 40 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/game/movement/packet_builder.cpp
View file

@ -147,42 +147,50 @@ namespace Movement
void PacketBuilder::WriteCreateBits(const MoveSpline& move_spline, ByteBuffer& data)
{
if (!data.WriteBit(!move_spline.Finalized()))
{
bool hasFullSpline = !move_spline.Finalized();
data.WriteBit(hasFullSpline);
if (!hasFullSpline)
return;
}
MoveSplineFlag splineFlags = move_spline.splineflags;
uint32 nodes = move_spline.getPath().size();
bool hasSplineStartTime = move_spline.splineflags & (MoveSplineFlag::Trajectory | MoveSplineFlag::Animation);
bool hasSplineVerticalAcceleration = (move_spline.splineflags & MoveSplineFlag::Trajectory) && move_spline.effect_start_time < move_spline.Duration();
data.WriteBits(uint8(move_spline.spline.mode()), 2);
data.WriteBit(hasSplineStartTime);
data.WriteBits(nodes, 22);
data.WriteBits(move_spline.splineflags.raw(), 25);
switch (move_spline.splineflags & MoveSplineFlag::Mask_Final_Facing)
{
case MoveSplineFlag::Final_Target:
{
data.WriteBits(2, 2);
data.WriteBits(1, 2);
data.WriteGuidMask<4, 3, 7, 2, 6, 1, 0, 5>(ObjectGuid(move_spline.facing.target));
data.WriteGuidMask<0, 1, 6, 5, 2, 3, 4, 7>(ObjectGuid(move_spline.facing.target));
break;
}
case MoveSplineFlag::Final_Angle:
data.WriteBits(0, 2);
break;
case MoveSplineFlag::Final_Point:
data.WriteBits(1, 2);
data.WriteBits(3, 2);
break;
default:
data.WriteBits(3, 2);
data.WriteBits(2, 2);
break;
}
bool hasUnkSplineCounter = false;
data.WriteBit(hasUnkSplineCounter);
if (hasUnkSplineCounter)
{
data.WriteBits(0, 23); // unk
data.WriteBits(0, 2); // unk
}
data.WriteBits(uint8(move_spline.spline.mode()), 2);
data.WriteBit(hasSplineVerticalAcceleration);
data.WriteBits(move_spline.splineflags.raw(), 25);
}
void PacketBuilder::WriteCreateBytes(const MoveSpline& move_spline, ByteBuffer& data)
@ -193,16 +201,32 @@ namespace Movement
uint32 nodes = move_spline.getPath().size();
bool hasSplineStartTime = move_spline.splineflags & (MoveSplineFlag::Trajectory | MoveSplineFlag::Animation);
bool hasSplineVerticalAcceleration = (move_spline.splineflags & MoveSplineFlag::Trajectory) && move_spline.effect_start_time < move_spline.Duration();
bool hasUnkSplineCounter = false;
uint32 unkSplineCounter = 0;
if (hasUnkSplineCounter)
{
for (int i = 0; i < unkSplineCounter; ++i)
data << float(0.0f) << float(0.0f);
}
if (move_spline.splineflags & MoveSplineFlag::Final_Target)
data.WriteGuidBytes<3, 2, 0, 5, 6, 7, 4, 1>(ObjectGuid(move_spline.facing.target));
data << int32(move_spline.timePassed());
data << int32(move_spline.Duration());
if (hasSplineVerticalAcceleration)
data << float(move_spline.vertical_acceleration); // added in 3.1
data << int32(move_spline.timePassed());
data << float(1.f);
data << float(1.f);
if (move_spline.splineflags & MoveSplineFlag::Final_Angle)
data << float(NormalizeOrientation(move_spline.facing.angle));
else if (move_spline.splineflags & MoveSplineFlag::Final_Target)
data.WriteGuidBytes<5, 3, 7, 1, 6, 4, 2, 0>(ObjectGuid(move_spline.facing.target));
if (move_spline.splineflags & MoveSplineFlag::Final_Point)
data << float(move_spline.facing.f.x) << float(move_spline.facing.f.z) << float(move_spline.facing.f.y);
if (hasSplineStartTime)
data << int32(move_spline.effect_start_time); // added in 3.1
for (uint32 i = 0; i < nodes; ++i)
{
@ -211,15 +235,8 @@ namespace Movement
data << float(move_spline.getPath()[i].y);
}
if (move_spline.splineflags & MoveSplineFlag::Final_Point)
data << float(move_spline.facing.f.x) << float(move_spline.facing.f.z) << float(move_spline.facing.f.y);
data << float(1.f);
data << int32(move_spline.Duration());
if (hasSplineStartTime)
data << int32(move_spline.effect_start_time); // added in 3.1
data << float(1.f);
if (move_spline.splineflags & MoveSplineFlag::Final_Angle)
data << float(NormalizeOrientation(move_spline.facing.angle));
}
if (!move_spline.isCyclic())