Merge branch 'master' into startstop

Author: Nico8340

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;
 };
 

utils/buildactions/utils.lua

@@ -96,7 +96,7 @@ function os.sha256_file(path)
 	local windows = os.host() == "windows"
 	local s, errc
 	if windows then
-		s, errc = os.outputof(string.format("CertUtil -hashfile \"%s\" SHA256", path))
+		s, errc = os.outputof(string.format("call \"utils\\7z\\7za.exe\" h -scrcSHA256 \"%s\"", path))
 	else
 		s, errc = os.outputof(string.format("sha256sum \"%s\" | awk '{ print $1 }'", path))
 	end
@@ -109,7 +109,7 @@ function os.sha256_file(path)
 
 	-- Clean windows output
 	if windows then
-		s = (s:match("\n(.*)\n(.*)") or ""):gsub(" ", "")
+		s = (s:match("SHA256 for data: +([^\n]*)") or "")
 	end
 
 	return s:lower()

win-build.bat

@@ -45,7 +45,7 @@ IF /i [%2] == [Win32] (
     set BUILD_PLATFORM=ARM64
 ) ELSE (
     IF not [%2] == [] (
-        echo Invalid first argument %2. Using default platform %BUILD_PLATFORM%.
+        echo Invalid second argument %2. Using default platform %BUILD_PLATFORM%.
     )
 )
 

wine-build.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+if [ -z "$MSBUILDPATH" ]; then
+    echo "Could not find MSBuild. Make sure the MSBUILDPATH environment variable points"
+    echo "to either MSBuild.exe or a script that handles the invocation of MSBuild.exe."
+    echo ""
+    echo "If using msvc-wine, it should point to /path/to/msvc-wine-install-dir/bin/x64/msbuild"
+    exit 1
+fi
+echo "Found MSBuild at: $MSBUILDPATH"
+
+BUILD_CONFIGURATION=Release
+BUILD_PLATFORM=Win32
+
+# Read configuration (1st parameter)
+case ${1,,} in
+    debug)   BUILD_CONFIGURATION=Debug ;;
+    release) BUILD_CONFIGURATION=Release ;;
+    "") ;;
+    *) echo "Invalid first argument $1. Using default configuration $BUILD_CONFIGURATION." ;;
+esac
+
+# Read platform (2nd parameter)
+case ${2,,} in
+    win32) BUILD_PLATFORM=Win32 ;;
+    x64)   BUILD_PLATFORM=x64 ;;
+    arm)   BUILD_PLATFORM=ARM ;;
+    arm64) BUILD_PLATFORM=ARM64 ;;
+    "") ;;
+    *) echo "Invalid second argument $2. Using default platform $BUILD_PLATFORM." ;;
+esac
+
+echo "Build configuration:"
+echo "  BUILD_CONFIGURATION = $BUILD_CONFIGURATION"
+echo "  BUILD_PLATFORM = $BUILD_PLATFORM"
+
+# Create solution (ignoring pause)
+wine win-create-projects.bat < /dev/null
+echo ""
+
+# Start compiling
+"$MSBUILDPATH" Build/MTASA.sln -property:Configuration="$BUILD_CONFIGURATION" -property:Platform="$BUILD_PLATFORM" -maxCpuCount