Synchronize changes from 1.6 master branch [ci skip]

8b199c4 Follow-up to pull request #4326 (PR #4328)
5f7cb8e Visual Studio Update
449cf0f Update client en_US pot

Author: github-actions[bot]

Client/mods/deathmatch/logic/CNetAPI.cpp

@@ -1119,8 +1119,16 @@ void CNetAPI::WritePlayerPuresync(CClientPlayer* pPlayerModel, NetBitStreamInter
     flags.data.bSyncingVelocity = (!flags.data.bIsOnGround || (pPlayerModel->GetPlayerSyncCount() % 4) == 0);
     flags.data.bStealthAiming = (pPlayerModel->IsStealthAiming() == true);
     flags.data.isReloadingWeapon = (pPlayerModel->IsReloadingWeapon() == true);
+    flags.data.animInterrupted = pPlayerModel->HasSyncedAnim() && (!pPlayerModel->IsRunningAnimation() || pPlayerModel->m_animationOverridedByClient);
 
-    if (pPlayerWeapon->GetSlot() > 15)
+    // The animation has been overwritten or interrupted by the client
+    if (flags.data.animInterrupted)
+    {
+        pPlayerModel->SetHasSyncedAnim(false);
+        pPlayerModel->m_animationOverridedByClient = false;
+    }
+
+    if (flags.data.bHasAWeapon && pPlayerWeapon->GetSlot() > 15)
         flags.data.bHasAWeapon = false;
 
     BitStream.Write(&flags);

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

@@ -63,6 +63,9 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)
         pSourcePlayer->SetStealthAiming(flags.data.bStealthAiming);
         pSourcePlayer->SetReloadingWeapon(flags.data.isReloadingWeapon);
 
+        if (flags.data.animInterrupted)
+            pSourcePlayer->SetAnimationData({});
+
         // Contact element
         CElement* pContactElement = NULL;
         if (flags.data.bHasContact)

Shared/sdk/net/SyncStructures.h

@@ -544,7 +544,7 @@ struct SPlayerPuresyncFlags : public ISyncStructure
 {
     enum
     {
-        BITCOUNT = 13
+        BITCOUNT = 14
     };
 
     bool Read(NetBitStreamInterface& stream)
@@ -572,6 +572,7 @@ struct SPlayerPuresyncFlags : public ISyncStructure
         bool bSyncingVelocity : 1;
         bool bStealthAiming : 1;
         bool isReloadingWeapon : 1;
+        bool animInterrupted : 1;
     } data;
 };