Make suggested changes

Author: Nico8340

Client/mods/deathmatch/logic/CNetAPI.cpp

@@ -1119,7 +1119,7 @@ void CNetAPI::WritePlayerPuresync(CClientPlayer* pPlayerModel, NetBitStreamInter
     flags.data.bStealthAiming = (pPlayerModel->IsStealthAiming() == true);
 
     if (BitStream.Can(eBitStreamVersion::IsPedReloadingWeapon))
-        flags.data.isReloadingWeapon = (pPlayerModel->IsReloadingWeapon() == true);
+        flags.data2.isReloadingWeapon = (pPlayerModel->IsReloadingWeapon() == true);
 
     if (pPlayerWeapon->GetSlot() > 15)
         flags.data.bHasAWeapon = false;

Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.cpp

@@ -61,7 +61,9 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)
         pSourcePlayer->SetAkimboArmUp(flags.data.bAkimboTargetUp);
         pSourcePlayer->SetOnFire(flags.data.bIsOnFire);
         pSourcePlayer->SetStealthAiming(flags.data.bStealthAiming);
-        pSourcePlayer->SetReloadingWeapon(flags.data.isReloadingWeapon);
+
+        if (BitStream.Can(eBitStreamVersion::IsPedReloadingWeapon))
+            pSourcePlayer->SetReloadingWeapon(flags.data2.isReloadingWeapon);
 
         // Contact element
         CElement* pContactElement = NULL;
@@ -343,7 +345,7 @@ bool CPlayerPuresyncPacket::Write(NetBitStreamInterface& BitStream) const
         flags.data.bStealthAiming = (pSourcePlayer->IsStealthAiming() == true);
 
         if (pSourcePlayer->CanBitStream(eBitStreamVersion::IsPedReloadingWeapon))
-            flags.data.isReloadingWeapon = pSourcePlayer->IsReloadingWeapon();
+            flags.data2.isReloadingWeapon = pSourcePlayer->IsReloadingWeapon();
 
         CVector vecPosition = pSourcePlayer->GetPosition();
         if (pContactElement)

Shared/sdk/net/SyncStructures.h

@@ -544,11 +544,33 @@ struct SPlayerPuresyncFlags : public ISyncStructure
 {
     enum
     {
-        BITCOUNT = 13
+        BITCOUNT = 12
     };
 
-    bool Read(NetBitStreamInterface& bitStream) { return bitStream.ReadBits((char*)&data, BITCOUNT); }
-    void Write(NetBitStreamInterface& bitStream) const { bitStream.WriteBits((const char*)&data, BITCOUNT); }
+    enum
+    {
+        BITCOUNT2 = 1
+    };
+
+    bool Read(NetBitStreamInterface& stream)
+    {
+        bool ok = stream.ReadBits((char*)&data, BITCOUNT);
+
+        if (stream.Can(eBitStreamVersion::IsPedReloadingWeapon))
+            ok &= stream.ReadBits((char*)&data2, BITCOUNT2);
+        else
+            data2.isReloadingWeapon = 0;
+
+        return ok;
+    }
+
+    void Write(NetBitStreamInterface& stream) const
+    {
+        stream.WriteBits((const char*)&data, BITCOUNT);
+
+        if (stream.Can(eBitStreamVersion::IsPedReloadingWeapon))
+            stream.WriteBits((const char*)&data2, BITCOUNT2);
+    }
 
     struct
     {
@@ -564,8 +586,12 @@ struct SPlayerPuresyncFlags : public ISyncStructure
         bool bHasAWeapon : 1;
         bool bSyncingVelocity : 1;
         bool bStealthAiming : 1;
-        bool isReloadingWeapon : 1;
     } data;
+
+    struct
+    {
+        bool isReloadingWeapon : 1;
+    } data2;
 };
 
 struct SPedRotationSync : public ISyncStructure