Core/PacketIO: Corrected structure of CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE and SMSG_MOVE_UPDATE_RUN_SPEED

1 files changed, 10 insertions, 1 deletions

diff --git a/src/server/game/Movement/MovementStructures.h b/src/server/game/Movement/MovementStructures.h
index daf00c37d3c..bddb8cb79c2 100644
--- a/src/server/game/Movement/MovementStructures.h
+++ b/src/server/game/Movement/MovementStructures.h
@@ -95,7 +95,7 @@ enum MovementStatusElements
     MSEZeroBit,         // writes bit value 1 or skips read bit
     MSEOneBit,          // writes bit value 0 or skips read bit
     MSEEnd,             // marks end of parsing
-    MSEExtraElement,    // Used to sinalize reading into ExtraMovementStatusElement, element sequence inside it is declared as separate array
+    MSEExtraElement,    // Used to signalize reading into ExtraMovementStatusElement, element sequence inside it is declared as separate array
                         // Allowed internal elements are: GUID markers (not transport), MSEExtraFloat, MSEExtraInt8
     MSEExtraFloat,
     MSEExtraInt8,
@@ -104,8 +104,12 @@ enum MovementStatusElements
 
 namespace Movement
 {
+    class PacketSender;
+
     class ExtraMovementStatusElement
     {
+        friend class PacketSender;
+
     public:
         ExtraMovementStatusElement(MovementStatusElements const* elements) : _elements(elements), _index(0) { }
 
@@ -119,6 +123,9 @@ namespace Movement
             int8  byteData;
         } Data;
 
+    protected:
+        void ResetIndex() { _index = 0; }
+
     private:
         MovementStatusElements const* _elements;
         uint32 _index;
@@ -137,6 +144,8 @@ namespace Movement
         Opcodes _selfOpcode;
         Opcodes _broadcast;
     };
+
+    bool PrintInvalidSequenceElement(MovementStatusElements element, char const* function);
 }
 
 MovementStatusElements* GetMovementStatusElementsSequence(Opcodes opcode);