Core/Movement: updated collision height packet handling to ack handling

This commit is contained in:
Ovahlord committed 2021-11-16 07:11:00 +01:00
1 parent 4b56a7b9a3
commit 631b499414
8 files changed
+122 -20

No files matched your search

@@ -2496,6 +2496,31 @@ MovementStatusElements const MovementUpdateFlightSpeed[] =
MSEEnd
};
MovementStatusElements const MovementSetCollisionHeight[] =
{
MSEExtraElement,
MSEHasGuidByte6,
MSEHasGuidByte1,
MSEHasGuidByte4,
MSEHasGuidByte7,
MSEHasGuidByte5,
MSEHasGuidByte2,
MSEHasGuidByte0,
MSEHasGuidByte3,
MSEFlushBits,
MSEGuidByte6,
MSEGuidByte0,
MSEGuidByte4,
MSEGuidByte3,
MSEGuidByte5,
MSECounter,
MSEGuidByte1,
MSEGuidByte2,
MSEGuidByte7,
MSEExtraElement,
MSEEnd
};
MovementStatusElements const MovementUpdateCollisionHeight[] =
{
MSEPositionZ,
@@ -2646,15 +2671,14 @@ MovementStatusElements const MovementForceRunSpeedChangeAck[] =
MovementStatusElements const MovementSetCollisionHeightAck[] =
{
MSEExtraElement,
MSEExtraElement, // Height
MSEPositionX,
MSEPositionZ,
MSECounter,
MSEPositionY,
MSEHasGuidByte6,
MSEHasGuidByte4,
MSEZeroBit, // Reason bit 1
MSEZeroBit, // Reason bit 2
MSEExtraElement, // Reason
MSEHasPitch,
MSEHasGuidByte5,
MSEHasHeightChangeFailed,
@@ -5482,6 +5506,9 @@ void Movement::ExtraMovementStatusElement::ReadNextElement(ByteBuffer& packet)
case MSEExtraInt8:
packet >> Data.byteData;
break;
case MSEExtraTwoBits:
Data.byteData = packet.ReadBits(2);
break;
default:
ASSERT(PrintInvalidSequenceElement(element, __FUNCTION__));
break;
@@ -5520,6 +5547,9 @@ void Movement::ExtraMovementStatusElement::WriteNextElement(ByteBuffer& packet)
case MSEExtraInt8:
packet << Data.byteData;
break;
case MSEExtraTwoBits:
packet.WriteBits(Data.byteData, 2);
break;
default:
ASSERT(PrintInvalidSequenceElement(element, __FUNCTION__));
break;
@@ -5667,6 +5697,8 @@ MovementStatusElements const* GetMovementStatusElementsSequence(uint32 opcode)
return MovementSetCanTransitionBetweenSwimAndFlyAck;
case CMSG_MOVE_SET_COLLISION_HEIGHT_ACK:
return MovementSetCollisionHeightAck;
case SMSG_MOVE_SET_COLLISION_HEIGHT:
return MovementSetCollisionHeight;
case SMSG_MOVE_UPDATE_COLLISION_HEIGHT:
return MovementUpdateCollisionHeight;
case CMSG_MOVE_WATER_WALK_ACK: