diff --git a/src/game/Object/Unit.cpp b/src/game/Object/Unit.cpp index 1a247c293..7aff94a2e 100644 --- a/src/game/Object/Unit.cpp +++ b/src/game/Object/Unit.cpp @@ -86,9 +86,7 @@ void MovementInfo::Read(ByteBuffer& data, uint16 opcode) { bool hasTransportData = false, hasMovementFlags = false, - hasMovementFlags2 = false, - hasUnkTime = false; - uint32 counterCount = 0; + hasMovementFlags2 = false; MovementStatusElements* sequence = GetMovementStatusElementsSequence(opcode); if(!sequence) @@ -146,10 +144,10 @@ void MovementInfo::Read(ByteBuffer& data, uint16 opcode) if (hasMovementFlags2) moveFlags2 = data.ReadBits(13); break; - case MSEHasUnknownBit: + case MSEUnknownBit: data.ReadBit(); break; - //case MSEHasUnknownBit2: + //case MSEUnknownBit2: // si.unkBit2 = data.ReadBit(); // break; //case MSEHasUnkInt32: @@ -271,11 +269,8 @@ void MovementInfo::Read(ByteBuffer& data, uint16 opcode) if (hasTransportData && si.hasTransportTime3) data >> fallTime; break; - case MSECounterCount: - counterCount = data.ReadBits(22); - break; case MSEMovementCounter: - for (int i = 0; i < counterCount; i++) + //for (int i = 0; i < counterCount; i++) data.read_skip(); break; //case MSEUnknownCount: @@ -289,13 +284,6 @@ void MovementInfo::Read(ByteBuffer& data, uint16 opcode) // if (si.hasUnkInt32) // data >> unkInt32; // break; - case MSEHasUnkTime: - hasUnkTime = !data.ReadBit(); - break; - case MSEUnkTime: - if (hasUnkTime) - data.read_skip(); - break; default: MANGOS_ASSERT(false && "Wrong movement status element"); break; @@ -374,10 +362,10 @@ void MovementInfo::Write(ByteBuffer& data, uint16 opcode) const case MSEHasTimestamp: data.WriteBit(!si.hasTimeStamp); break; - case MSEHasUnknownBit: + case MSEUnknownBit: data.WriteBit(false); break; - //case MSEHasUnknownBit2: + //case MSEUnknownBit2: // data.WriteBit(si.unkBit2); // break; //case MSEHasUnkInt32: @@ -483,19 +471,16 @@ void MovementInfo::Write(ByteBuffer& data, uint16 opcode) const if (hasTransportData && si.hasTransportTime3) data << uint32(fallTime); break; - case MSECounterCount: - data.WriteBits(0, 22); - break; case MSEMovementCounter: data << uint32(0); break; - //case MSEUnknownCount: - // data.WriteBits(unkArray.size(), 24); - // break; - //case MSEUnknownArray: - // for (std::list::const_iterator itr = unkArray.begin(); itr != unkArray.end(); ++itr) - // data << uint32(*itr); - // break; + /* case MSEUnknownCount: + data.WriteBits(unkArray.size(), 24); + break;*/ + case MSEUnknownArray: + for (std::list::const_iterator itr = unkArray.begin(); itr != unkArray.end(); ++itr) + data << uint32(*itr); + break; //case MSEUnkInt32: // if (si.hasUnkInt32) // data << int32(unkInt32); diff --git a/src/game/Object/Unit.h b/src/game/Object/Unit.h index 044341f2b..50d17e638 100644 --- a/src/game/Object/Unit.h +++ b/src/game/Object/Unit.h @@ -844,6 +844,10 @@ class MovementInfo JumpInfo jump; // spline float splineElevation; + // unknown array + std::list unkArray; + // unknown int32 + int32 unkInt32; // status info StatusInfo si; int8 byteParam; diff --git a/src/game/movement/MovementStructures.h b/src/game/movement/MovementStructures.h index ff167001d..635e5235e 100644 --- a/src/game/movement/MovementStructures.h +++ b/src/game/movement/MovementStructures.h @@ -36,8 +36,8 @@ enum MovementStatusElements MSEGuidBit5, MSEGuidBit6, MSEGuidBit7, - MSEHasUnknownBit, - MSEHasUnknownBit2, + MSEUnknownBit, + MSEUnknownBit2, MSEUnknownCount, MSEHasUnkInt32, MSEHasMovementFlags, @@ -97,10 +97,7 @@ enum MovementStatusElements MSEMovementCounter, MSEUnknownArray, MSEUnkInt32, - MSECounterCount, MSEUintCount, - MSEHasUnkTime, - MSEUnkTime, MSEEnd, MSE_COUNT }; @@ -109,12 +106,12 @@ MovementStatusElements PlayerMoveSequence[] = { MSEHasPitch, MSEGuidBit2, - MSEHasUnknownBit, - MSEHasUnknownBit, + MSEUnknownBit, + MSEUnknownBit, MSEGuidBit0, MSEHasOrientation, MSEHasFallData, - MSEHasUnknownBit, + MSEHasUnkInt32, MSEGuidBit3, MSEHasFallDirection, MSEHasTransportData, @@ -131,7 +128,7 @@ MovementStatusElements PlayerMoveSequence[] = MSETransportGuidBit0, MSEHasSplineElevation, MSEHasMovementFlags, - MSEHasUnknownBit, + MSEUnknownBit, MSEFlags, MSEHasMovementFlags2, MSEGuidBit7, @@ -139,7 +136,7 @@ MovementStatusElements PlayerMoveSequence[] = MSEHasTimestamp, MSEFlags2, MSEGuidBit5, - MSECounterCount, + MSEUnknownCount, MSEGuidBit6, MSEPositionY, MSETransportGuidByte7, @@ -174,6 +171,7 @@ MovementStatusElements PlayerMoveSequence[] = MSEGuidByte2, MSEGuidByte6, MSESplineElevation, + MSEUnkInt32, MSEPositionX, MSEGuidByte4, MSEGuidByte7, @@ -186,11 +184,11 @@ MovementStatusElements MovementFallLandSequence[] = MSEPositionZ, MSEPositionX, MSEHasFallData, - MSEHasUnknownBit, - MSEHasUnknownBit, + MSEUnknownBit, + MSEUnknownBit, MSEHasTimestamp, MSEGuidBit7, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasSplineElevation, MSEGuidBit5, MSEHasPitch, @@ -199,9 +197,9 @@ MovementStatusElements MovementFallLandSequence[] = MSEGuidBit3, MSEGuidBit0, MSEHasOrientation, - MSECounterCount, + MSEUnknownCount, MSEHasMovementFlags, - MSEHasUnkTime, + MSEHasUnkInt32, MSEGuidBit1, MSEHasTransportData, MSEGuidBit6, @@ -237,6 +235,7 @@ MovementStatusElements MovementFallLandSequence[] = MSETransportPositionY, MSETransportPositionO, MSETransportPositionZ, + MSETransportSeat, MSETransportGuidByte3, MSETransportGuidByte6, MSETransportTime2, @@ -248,7 +247,7 @@ MovementStatusElements MovementFallLandSequence[] = MSETransportPositionX, MSETransportGuidByte7, MSETransportGuidByte0, - MSEUnkTime, + MSEUnkInt32, MSETimestamp, MSESplineElevation, MSEPitch, @@ -261,15 +260,15 @@ MovementStatusElements MovementHeartBeatSequence[] = MSEPositionZ, MSEPositionX, MSEPositionY, - MSECounterCount, + MSEUnknownCount, MSEHasMovementFlags, - MSEHasUnknownBit, - MSEHasUnkTime, + MSEUnknownBit, + MSEHasUnkInt32, MSEGuidBit3, MSEGuidBit6, MSEHasPitch, - MSEHasUnknownBit, - MSEHasUnknownBit, + MSEUnknownBit, + MSEUnknownBit, MSEGuidBit7, MSEGuidBit2, MSEGuidBit4, @@ -308,26 +307,27 @@ MovementStatusElements MovementHeartBeatSequence[] = MSEFallCosAngle, MSEFallHorizontalSpeed, MSEFallTime, - MSETransportGuidByte5, - MSETransportGuidByte7, - MSETransportGuidByte4, - MSETransportGuidByte0, - MSETransportPositionZ, - MSETransportGuidByte6, - MSETransportGuidByte2, - MSETransportPositionY, - MSETransportTime, - MSETransportPositionX, - MSETransportTime2, MSETransportGuidByte1, MSETransportGuidByte3, + MSETransportGuidByte2, + MSETransportGuidByte0, MSETransportTime3, + MSETransportSeat, + MSETransportGuidByte7, + MSETransportPositionX, + MSETransportGuidByte4, + MSETransportTime2, + MSETransportPositionY, + MSETransportGuidByte6, + MSETransportGuidByte5, + MSETransportPositionZ, + MSETransportTime, MSETransportPositionO, - MSESplineElevation, + MSEUnkInt32, MSEPositionO, MSEPitch, - MSEUnkTime, MSETimestamp, + MSESplineElevation, MSEEnd, }; @@ -344,16 +344,16 @@ MovementStatusElements MovementJumpSequence[] = MSEHasOrientation, MSEGuidBit6, MSEGuidBit4, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasTransportData, - MSEHasUnknownBit, - MSECounterCount, + MSEUnknownBit, + MSEUnknownCount, MSEHasPitch, MSEHasMovementFlags, MSEHasTimestamp, - MSEHasUnkTime, + MSEHasUnkInt32, MSEGuidBit3, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasFallData, MSEGuidBit2, MSEGuidBit0, @@ -386,6 +386,7 @@ MovementStatusElements MovementJumpSequence[] = MSEFallTime, MSETransportGuidByte5, MSETransportGuidByte7, + MSETransportSeat, MSETransportGuidByte4, MSETransportGuidByte0, MSETransportPositionZ, @@ -402,7 +403,7 @@ MovementStatusElements MovementJumpSequence[] = MSESplineElevation, MSEPositionO, MSEPitch, - MSEUnkTime, + MSEUnkInt32, MSETimestamp, MSEEnd, }; @@ -416,16 +417,16 @@ MovementStatusElements MovementSetFacingSequence[] = MSEHasMovementFlags2, MSEGuidBit3, MSEGuidBit2, - MSECounterCount, - MSEHasUnknownBit, + MSEUnknownCount, + MSEUnknownBit, MSEHasPitch, MSEGuidBit0, MSEHasOrientation, MSEHasTimestamp, - MSEHasUnknownBit, - MSEHasUnkTime, + MSEUnknownBit, + MSEHasUnkInt32, MSEGuidBit4, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit1, MSEGuidBit6, MSEHasFallData, @@ -465,6 +466,7 @@ MovementStatusElements MovementSetFacingSequence[] = MSETransportPositionX, MSETransportTime2, MSETransportPositionZ, + MSETransportSeat, MSETransportPositionY, MSETransportGuidByte4, MSETransportGuidByte3, @@ -475,7 +477,7 @@ MovementStatusElements MovementSetFacingSequence[] = MSEFallHorizontalSpeed, MSEFallSinAngle, MSEFallCosAngle, - MSEUnkTime, + MSEUnkInt32, MSETimestamp, MSESplineElevation, MSEPositionO, @@ -502,7 +504,7 @@ MovementStatusElements MovementSetPitchSequence[] = MSEGuidBit4, MSEHasSpline, MSEGuidBit2, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasTimestamp, MSEGuidBit0, MSEGuidBit5, @@ -564,9 +566,9 @@ MovementStatusElements MovementStartBackwardSequence[] = MSEHasOrientation, MSEGuidBit7, MSEGuidBit2, - MSECounterCount, + MSEUnknownCount, MSEHasFallData, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit5, MSEGuidBit3, MSEGuidBit6, @@ -576,11 +578,11 @@ MovementStatusElements MovementStartBackwardSequence[] = MSEGuidBit0, MSEHasMovementFlags, MSEHasPitch, - MSEHasUnkTime, + MSEHasUnkInt32, MSEHasMovementFlags2, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit1, - MSEHasUnknownBit, + MSEUnknownBit, MSETransportGuidBit1, MSEHasTransportTime2, MSETransportGuidBit0, @@ -603,13 +605,14 @@ MovementStatusElements MovementStartBackwardSequence[] = MSEGuidByte4, MSEGuidByte7, MSEGuidByte6, - MSEUnkTime, + MSEUnkInt32, MSETransportTime, MSETransportGuidByte4, MSETransportGuidByte1, MSETransportGuidByte5, MSETransportGuidByte3, MSETransportGuidByte6, + MSETransportSeat, MSETransportPositionO, MSETransportPositionX, MSETransportGuidByte0, @@ -637,13 +640,13 @@ MovementStatusElements MovementStartForwardSequence[] = MSEPositionX, MSEPositionY, MSEHasMovementFlags2, - MSEHasUnknownBit, - MSEHasUnkTime, - MSEHasUnknownBit, + MSEUnknownBit, + MSEHasUnkInt32, + MSEUnknownBit, MSEGuidBit0, MSEHasOrientation, MSEHasFallData, - MSECounterCount, + MSEUnknownCount, MSEGuidBit4, MSEGuidBit1, MSEHasTimestamp, @@ -656,7 +659,7 @@ MovementStatusElements MovementStartForwardSequence[] = MSEHasSplineElevation, MSEGuidBit2, MSEGuidBit6, - MSEHasUnknownBit, + MSEUnknownBit, MSETransportGuidBit1, MSEHasTransportTime3, MSETransportGuidBit3, @@ -685,6 +688,7 @@ MovementStatusElements MovementStartForwardSequence[] = MSETransportPositionZ, MSETransportGuidByte4, MSETransportTime3, + MSETransportSeat, MSETransportGuidByte7, MSETransportPositionO, MSETransportTime2, @@ -703,7 +707,7 @@ MovementStatusElements MovementStartForwardSequence[] = MSEPitch, MSESplineElevation, MSEPositionO, - MSEUnkTime, + MSEUnkInt32, MSEEnd, }; @@ -717,19 +721,19 @@ MovementStatusElements MovementStartStrafeLeftSequence[] = MSEGuidBit3, MSEHasMovementFlags2, MSEHasPitch, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit2, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasTransportData, MSEHasFallData, MSEGuidBit5, - MSECounterCount, - MSEHasUnknownBit, + MSEUnknownCount, + MSEUnknownBit, MSEGuidBit4, MSEHasOrientation, MSEHasSplineElevation, MSEGuidBit7, - MSEHasUnkTime, + MSEHasUnkInt32, MSEGuidBit1, MSEGuidBit6, MSEHasMovementFlags, @@ -767,6 +771,7 @@ MovementStatusElements MovementStartStrafeLeftSequence[] = MSETransportPositionY, MSETransportGuidByte4, MSETransportTime, + MSETransportSeat, MSETransportPositionX, MSETransportGuidByte0, MSETransportGuidByte7, @@ -777,7 +782,7 @@ MovementStatusElements MovementStartStrafeLeftSequence[] = MSEFallHorizontalSpeed, MSEFallSinAngle, MSEFallVerticalSpeed, - MSEUnkTime, + MSEUnkInt32, MSESplineElevation, MSEPositionO, MSEEnd, @@ -790,7 +795,7 @@ MovementStatusElements MovementStartStrafeRightSequence[] = MSEPositionZ, MSEGuidBit0, MSEHasFallData, - MSECounterCount, + MSEUnknownCount, MSEGuidBit7, MSEGuidBit6, MSEGuidBit4, @@ -798,16 +803,16 @@ MovementStatusElements MovementStartStrafeRightSequence[] = MSEGuidBit5, MSEHasSplineElevation, MSEGuidBit3, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasTransportData, - MSEHasUnkTime, + MSEHasUnkInt32, MSEGuidBit1, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit2, MSEHasPitch, MSEHasMovementFlags2, MSEHasOrientation, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasTimestamp, MSEHasFallDirection, MSETransportGuidBit1, @@ -833,6 +838,7 @@ MovementStatusElements MovementStartStrafeRightSequence[] = MSEGuidByte5, MSEPitch, MSETransportGuidByte1, + MSETransportSeat, MSETransportGuidByte3, MSETransportTime2, MSETransportGuidByte7, @@ -854,7 +860,7 @@ MovementStatusElements MovementStartStrafeRightSequence[] = MSEFallSinAngle, MSEFallTime, MSEPositionO, - MSEUnkTime, + MSEUnkInt32, MSESplineElevation, MSEEnd, }; @@ -867,18 +873,18 @@ MovementStatusElements MovementStartTurnLeftSequence[] = MSEHasOrientation, MSEGuidBit4, MSEGuidBit5, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasTimestamp, - MSEHasUnknownBit, - MSEHasUnknownBit, - MSEHasUnkTime, + MSEUnknownBit, + MSEUnknownBit, + MSEHasUnkInt32, MSEGuidBit3, MSEGuidBit1, MSEHasMovementFlags2, MSEHasMovementFlags, MSEGuidBit0, MSEGuidBit2, - MSECounterCount, + MSEUnknownCount, MSEHasTransportData, MSEGuidBit7, MSEHasPitch, @@ -926,11 +932,12 @@ MovementStatusElements MovementStartTurnLeftSequence[] = MSETransportGuidByte4, MSETransportGuidByte0, MSETransportTime3, + MSETransportSeat, MSETransportGuidByte6, MSETransportTime, MSEPositionO, MSESplineElevation, - MSEUnkTime, + MSEUnkInt32, MSETimestamp, MSEEnd, }; @@ -940,15 +947,15 @@ MovementStatusElements MovementStartTurnRightSequence[] = MSEPositionX, MSEPositionZ, MSEPositionY, - MSEHasUnknownBit, - MSEHasUnknownBit, + MSEUnknownBit, + MSEUnknownBit, MSEGuidBit1, MSEGuidBit0, MSEHasMovementFlags, MSEHasFallData, MSEHasPitch, - MSEHasUnkTime, - MSECounterCount, + MSEHasUnkInt32, + MSEUnknownCount, MSEHasSplineElevation, MSEHasMovementFlags2, MSEHasOrientation, @@ -958,7 +965,7 @@ MovementStatusElements MovementStartTurnRightSequence[] = MSEGuidBit6, MSEGuidBit5, MSEGuidBit3, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasTransportData, MSEGuidBit7, MSETransportGuidBit2, @@ -995,6 +1002,7 @@ MovementStatusElements MovementStartTurnRightSequence[] = MSETransportGuidByte7, MSETransportGuidByte1, MSETransportPositionX, + MSETransportSeat, MSETransportGuidByte5, MSETransportGuidByte4, MSETransportGuidByte2, @@ -1007,7 +1015,7 @@ MovementStatusElements MovementStartTurnRightSequence[] = MSEPositionO, MSETimestamp, MSESplineElevation, - MSEUnkTime, + MSEUnkInt32, MSEEnd, }; @@ -1020,16 +1028,16 @@ MovementStatusElements MovementStopSequence[] = MSEGuidBit2, MSEHasFallData, MSEGuidBit0, - MSEHasUnknownBit, - MSEHasUnknownBit, - MSEHasUnkTime, + MSEUnknownBit, + MSEUnknownBit, + MSEHasUnkInt32, MSEGuidBit1, - MSECounterCount, + MSEUnknownCount, MSEHasPitch, MSEGuidBit3, MSEGuidBit4, MSEHasTransportData, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit6, MSEHasMovementFlags, MSEHasTimestamp, @@ -1077,10 +1085,11 @@ MovementStatusElements MovementStopSequence[] = MSETransportGuidByte4, MSETransportTime3, MSETransportGuidByte0, + MSETransportSeat, MSETransportPositionZ, MSETransportGuidByte5, MSETransportTime2, - MSEUnkTime, + MSEUnkInt32, MSEPitch, MSETimestamp, MSEEnd, @@ -1096,21 +1105,21 @@ MovementStatusElements MovementStopStrafeSequence[] = MSEHasSplineElevation, MSEHasTimestamp, MSEHasMovementFlags, - MSEHasUnkTime, + MSEHasUnkInt32, MSEGuidBit6, MSEHasTransportData, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasMovementFlags2, MSEGuidBit4, MSEHasPitch, MSEGuidBit5, MSEGuidBit3, MSEGuidBit2, - MSECounterCount, - MSEHasUnknownBit, + MSEUnknownCount, + MSEUnknownBit, MSEGuidBit7, MSEGuidBit0, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit1, MSETransportGuidBit7, MSEHasTransportTime3, @@ -1144,6 +1153,7 @@ MovementStatusElements MovementStopStrafeSequence[] = MSETransportGuidByte4, MSETransportTime2, MSETransportGuidByte3, + MSETransportSeat, MSETransportPositionX, MSETransportGuidByte2, MSETransportGuidByte7, @@ -1158,7 +1168,7 @@ MovementStatusElements MovementStopStrafeSequence[] = MSEFallTime, MSEFallVerticalSpeed, MSEPitch, - MSEUnkTime, + MSEUnkInt32, MSEEnd, }; @@ -1168,13 +1178,13 @@ MovementStatusElements MovementStopTurnSequence[] = MSEPositionZ, MSEPositionY, MSEHasTransportData, - MSECounterCount, - MSEHasUnknownBit, + MSEUnknownCount, + MSEUnknownBit, MSEGuidBit4, MSEGuidBit5, - MSEHasUnkTime, + MSEHasUnkInt32, MSEGuidBit3, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasFallData, MSEGuidBit0, MSEGuidBit1, @@ -1182,7 +1192,7 @@ MovementStatusElements MovementStopTurnSequence[] = MSEGuidBit6, MSEHasMovementFlags, MSEGuidBit2, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasMovementFlags2, MSEHasSplineElevation, MSEHasOrientation, @@ -1212,6 +1222,7 @@ MovementStatusElements MovementStopTurnSequence[] = MSEGuidByte1, MSETransportTime, MSETransportTime3, + MSETransportSeat, MSETransportPositionY, MSETransportPositionX, MSETransportTime2, @@ -1232,7 +1243,7 @@ MovementStatusElements MovementStopTurnSequence[] = MSEFallHorizontalSpeed, MSEFallVerticalSpeed, MSEFallTime, - MSEUnkTime, + MSEUnkInt32, MSESplineElevation, MSEPitch, MSEEnd, @@ -1247,20 +1258,20 @@ MovementStatusElements MovementStartAscendSequence[] = MSEGuidBit3, MSEHasTransportData, MSEHasMovementFlags, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit0, MSEGuidBit4, MSEHasTimestamp, MSEGuidBit7, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasPitch, MSEGuidBit5, MSEHasMovementFlags2, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit6, MSEGuidBit2, - MSEHasUnkTime, - MSECounterCount, + MSEHasUnkInt32, + MSEUnknownCount, MSEGuidBit1, MSEHasSplineElevation, MSEHasFallData, @@ -1311,7 +1322,7 @@ MovementStatusElements MovementStartAscendSequence[] = MSEFallHorizontalSpeed, MSEFallTime, MSEPitch, - MSEUnkTime, + MSEUnkInt32, MSEEnd, }; @@ -1329,14 +1340,14 @@ MovementStatusElements MovementStartDescendSequence[] = MSEHasPitch, MSEGuidBit6, MSEGuidBit2, - MSEHasUnknownBit, - MSEHasUnkTime, - MSECounterCount, + MSEUnknownBit, + MSEHasUnkInt32, + MSEUnknownCount, MSEHasTransportData, MSEHasOrientation, MSEGuidBit1, - MSEHasUnknownBit, - MSEHasUnknownBit, + MSEUnknownBit, + MSEUnknownBit, MSEGuidBit3, MSEGuidBit5, MSEHasSplineElevation, @@ -1367,6 +1378,7 @@ MovementStatusElements MovementStartDescendSequence[] = MSETransportGuidByte0, MSETransportGuidByte3, MSETransportGuidByte7, + MSETransportSeat, MSETransportGuidByte5, MSETransportGuidByte1, MSETransportPositionY, @@ -1384,7 +1396,7 @@ MovementStatusElements MovementStartDescendSequence[] = MSEFallSinAngle, MSEFallVerticalSpeed, MSEPitch, - MSEUnkTime, + MSEUnkInt32, MSESplineElevation, MSEPositionO, MSETimestamp, @@ -1399,18 +1411,18 @@ MovementStatusElements MovementStartSwimSequence[] = MSEHasSplineElevation, MSEHasTransportData, MSEGuidBit2, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasMovementFlags2, - MSECounterCount, + MSEUnknownCount, MSEHasPitch, MSEHasTimestamp, MSEGuidBit3, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit6, MSEGuidBit1, MSEHasFallData, - MSEHasUnkTime, - MSEHasUnknownBit, + MSEHasUnkInt32, + MSEUnknownBit, MSEGuidBit7, MSEGuidBit0, MSEHasOrientation, @@ -1444,6 +1456,7 @@ MovementStatusElements MovementStartSwimSequence[] = MSETransportGuidByte7, MSETransportGuidByte0, MSETransportPositionY, + MSETransportSeat, MSETransportTime2, MSETransportGuidByte6, MSETransportGuidByte4, @@ -1462,7 +1475,7 @@ MovementStatusElements MovementStartSwimSequence[] = MSETimestamp, MSESplineElevation, MSEPositionO, - MSEUnkTime, + MSEUnkInt32, MSEPitch, MSEEnd, }; @@ -1475,16 +1488,16 @@ MovementStatusElements MovementStopSwimSequence[] = MSEHasPitch, MSEGuidBit6, MSEHasOrientation, - MSEHasUnknownBit, - MSEHasUnknownBit, - MSEHasUnknownBit, - MSEHasUnkTime, + MSEUnknownBit, + MSEUnknownBit, + MSEUnknownBit, + MSEHasUnkInt32, MSEGuidBit4, MSEHasMovementFlags2, MSEHasTransportData, MSEHasFallData, MSEGuidBit1, - MSECounterCount, + MSEUnknownCount, MSEHasMovementFlags, MSEGuidBit7, MSEGuidBit0, @@ -1524,6 +1537,7 @@ MovementStatusElements MovementStopSwimSequence[] = MSETransportGuidByte0, MSETransportGuidByte6, MSETransportGuidByte3, + MSETransportSeat, MSETransportPositionO, MSETransportGuidByte7, MSETransportGuidByte4, @@ -1538,7 +1552,7 @@ MovementStatusElements MovementStopSwimSequence[] = MSESplineElevation, MSEPitch, MSETimestamp, - MSEUnkTime, + MSEUnkInt32, MSEPositionO, MSEEnd, }; @@ -1556,15 +1570,15 @@ MovementStatusElements MovementStopAscendSequence[] = MSEGuidBit6, MSEHasMovementFlags2, MSEHasTimestamp, - MSEHasUnkTime, + MSEHasUnkInt32, MSEHasTransportData, MSEHasPitch, - MSEHasUnknownBit, - MSEHasUnknownBit, + MSEUnknownBit, + MSEUnknownBit, MSEGuidBit4, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit5, - MSECounterCount, + MSEUnknownCount, MSEHasFallData, MSEHasMovementFlags, MSEGuidBit1, @@ -1605,6 +1619,7 @@ MovementStatusElements MovementStopAscendSequence[] = MSETransportPositionZ, MSETransportTime3, MSETransportTime, + MSETransportSeat, MSETransportGuidByte6, MSEFallCosAngle, MSEFallHorizontalSpeed, @@ -1614,7 +1629,7 @@ MovementStatusElements MovementStopAscendSequence[] = MSETimestamp, MSESplineElevation, MSEPitch, - MSEUnkTime, + MSEUnkInt32, MSEPositionO, MSEEnd, }; @@ -1628,9 +1643,9 @@ MovementStatusElements MovementStopPitchSequence[] = MSEHasSplineElevation, MSEGuidBit0, MSEHasTimestamp, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit2, - MSECounterCount, + MSEUnknownCount, MSEHasOrientation, MSEHasMovementFlags, MSEHasPitch, @@ -1638,12 +1653,12 @@ MovementStatusElements MovementStopPitchSequence[] = MSEGuidBit7, MSEGuidBit5, MSEHasMovementFlags2, - MSEHasUnknownBit, - MSEHasUnkTime, + MSEUnknownBit, + MSEHasUnkInt32, MSEHasTransportData, MSEGuidBit6, MSEGuidBit4, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit1, MSETransportGuidBit4, MSETransportGuidBit5, @@ -1682,6 +1697,7 @@ MovementStatusElements MovementStopPitchSequence[] = MSETransportGuidByte6, MSETransportGuidByte2, MSETransportGuidByte3, + MSETransportSeat, MSETransportTime3, MSETransportTime, MSETransportGuidByte4, @@ -1691,7 +1707,7 @@ MovementStatusElements MovementStopPitchSequence[] = MSETimestamp, MSESplineElevation, MSEPositionO, - MSEUnkTime, + MSEUnkInt32, MSEEnd, }; @@ -1705,19 +1721,19 @@ MovementStatusElements MovementStartPitchDownSequence[] = MSEGuidBit3, MSEHasOrientation, MSEGuidBit5, - MSEHasUnknownBit, - MSEHasUnkTime, - MSEHasUnknownBit, + MSEUnknownBit, + MSEHasUnkInt32, + MSEUnknownBit, MSEHasMovementFlags, MSEGuidBit4, MSEGuidBit1, MSEHasSplineElevation, MSEHasFallData, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasTransportData, MSEHasTimestamp, MSEHasMovementFlags2, - MSECounterCount, + MSEUnknownCount, MSEGuidBit6, MSEGuidBit0, MSEHasPitch, @@ -1756,6 +1772,7 @@ MovementStatusElements MovementStartPitchDownSequence[] = MSETransportTime, MSETransportGuidByte6, MSETransportGuidByte1, + MSETransportSeat, MSETransportGuidByte2, MSETransportGuidByte5, MSETransportPositionX, @@ -1766,7 +1783,7 @@ MovementStatusElements MovementStartPitchDownSequence[] = MSEPositionO, MSETimestamp, MSESplineElevation, - MSEUnkTime, + MSEUnkInt32, MSEPitch, MSEEnd, }; @@ -1779,23 +1796,23 @@ MovementStatusElements MovementStartPitchUpSequence[] = MSEGuidBit0, MSEHasPitch, MSEGuidBit3, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasOrientation, MSEGuidBit5, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit2, MSEGuidBit7, MSEGuidBit1, MSEHasFallData, MSEHasMovementFlags2, MSEHasTransportData, - MSEHasUnkTime, + MSEHasUnkInt32, MSEHasMovementFlags, MSEGuidBit6, - MSECounterCount, + MSEUnknownCount, MSEHasTimestamp, MSEGuidBit4, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasSplineElevation, MSETransportGuidBit5, MSETransportGuidBit1, @@ -1819,6 +1836,7 @@ MovementStatusElements MovementStartPitchUpSequence[] = MSEGuidByte3, MSEGuidByte4, MSEGuidByte2, + MSETransportSeat, MSETransportGuidByte3, MSETransportTime3, MSETransportGuidByte2, @@ -1842,7 +1860,7 @@ MovementStatusElements MovementStartPitchUpSequence[] = MSEFallSinAngle, MSEFallCosAngle, MSEFallTime, - MSEUnkTime, + MSEUnkInt32, MSETimestamp, MSEEnd, }; @@ -1863,7 +1881,7 @@ MovementStatusElements MovementChngTransportSequence[]= MSEGuidBit5, MSEGuidBit7, MSEHasPitch, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit3, MSEHasSplineElevation, MSEGuidBit1, @@ -1931,7 +1949,7 @@ MovementStatusElements MovementSetRunModeSequence[] = MSEHasMovementFlags, MSEGuidBit7, MSEHasTransportData, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit0, MSEGuidBit3, MSEHasSplineElevation, @@ -2011,7 +2029,7 @@ MovementStatusElements MovementSetWalkModeSequence[] = MSEGuidBit2, MSEGuidBit5, MSEGuidBit3, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasMovementFlags2, MSEHasFallData, MSETransportGuidBit2, @@ -2071,7 +2089,7 @@ MovementStatusElements MovementFallResetSequence[] = MSEGuidBit1, MSEHasTimestamp, MSEHasMovementFlags, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit6, MSEHasSplineElevation, MSEHasPitch, @@ -2150,7 +2168,7 @@ MovementStatusElements MovementSetCanFlyAckSequence[] = MSEGuidBit5, MSEHasSplineElevation, MSEHasMovementFlags2, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit7, MSEHasSpline, MSEGuidBit6, @@ -2216,7 +2234,7 @@ MovementStatusElements MovementCastSpellSequence[] = MSEHasTimestamp, MSEHasOrientation, MSEHasSpline, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit6, MSEGuidBit4, MSEHasMovementFlags2, @@ -2296,7 +2314,7 @@ MovementStatusElements MovementSplineDoneSequence[] = MSEGuidBit3, MSEHasMovementFlags, MSEGuidBit0, - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit1, MSEGuidBit5, MSEHasPitch, @@ -2368,7 +2386,7 @@ MovementStatusElements MoveKnockbackAckSequence[] = MSEGuidBit2, MSEHasSpline, MSEGuidBit7, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasMovementFlags2, MSEHasTimestamp, MSEGuidBit0, @@ -2433,7 +2451,7 @@ MovementStatusElements MoveKnockbackAckSequence[] = MovementStatusElements MoveUpdateKnockBackSequence[] = { - MSEHasUnknownBit, + MSEUnknownBit, MSEGuidBit4, MSEHasMovementFlags, MSEHasPitch, @@ -2519,7 +2537,7 @@ MovementStatusElements MoveNotActiveMoverSequence[] = MSEGuidBit6, MSEHasSplineElevation, MSEGuidBit3, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasTimestamp, MSEGuidBit0, MSEHasOrientation, @@ -2599,7 +2617,7 @@ MovementStatusElements DismissControlledVehicleSequence[] = MSEHasPitch, MSEHasTimestamp, MSEGuidBit1, - MSEHasUnknownBit, + MSEUnknownBit, MSEHasSpline, MSEGuidBit3, MSEHasMovementFlags,