Merge pull request #216 from diamante0018/main

fix: iw4m compat

.github/workflows/build.yml

@@ -93,18 +93,18 @@ jobs:
       #  run: echo "BOIII_MASTER_PATH=${{ secrets.BOIII_MASTER_SSH_PATH_DEV }}" >> $GITHUB_ENV
 
       - name: Download Release binaries
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v3.0.2
         with:
           name: Release Binary
           
       - name: Download Release data artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v3.0.2
         with:
           name: Release data artifacts
           path: data
 
       - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
+        uses: shimataro/ssh-key-action@v2.5.0
         with:
           key: ${{ secrets.BOIII_MASTER_SSH_PRIVATE_KEY }}
           known_hosts: 'just-a-placeholder-so-we-dont-get-errors'

src/client/component/chat.cpp

@@ -2,7 +2,6 @@
 #include "loader/component_loader.hpp"
 #include "game/game.hpp"
 
-#include <utils/string.hpp>
 #include <utils/hook.hpp>
 
 #include "command.hpp"

src/client/component/dedicated_patches.cpp

@@ -5,7 +5,7 @@
 
 #include <utils/hook.hpp>
 
-namespace patches
+namespace dedicated_patches
 {
 	namespace
 	{
@@ -25,4 +25,4 @@ namespace patches
 	};
 }
 
-REGISTER_COMPONENT(patches::component)
+REGISTER_COMPONENT(dedicated_patches::component)

src/client/component/network.cpp

@@ -233,6 +233,11 @@ namespace network
 
 			utils::hook::set<uint8_t>(game::select(0x14224E90D, 0x1405315F9), 0xEB); // don't kick clients without dw handle
 
+			// Skip DW stuff in NetAdr_ToString
+			utils::hook::set<uint8_t>(game::select(0x142173952, 0x140515881), 0xEB);
+			// NA_IP -> NA_RAWIP in NetAdr_ToString
+			utils::hook::set<uint8_t>(game::select(0x142173934, 0x140515864), game::NA_RAWIP);
+
 			if (game::is_server())
 			{
 				// Remove restrictions for rcon commands

src/client/game/structs.hpp

@@ -740,7 +740,7 @@ namespace game
 
 	enum netsrc_t
 	{
-		NS_NULL = 0xFFFFFFFF,
+		NS_NULL = -1,
 		NS_CLIENT1 = 0x0,
 		NS_CLIENT2 = 0x1,
 		NS_CLIENT3 = 0x2,