Merge branch 'develop' into feature/scripting

.gitmodules

@@ -31,8 +31,7 @@
 	url = https://github.com/discord/discord-rpc.git
 [submodule "deps/asmjit"]
 	path = deps/asmjit
-	url = https://github.com/Joelrau/asmjit.git
-	branch = old-state
+	url = https://github.com/asmjit/asmjit.git
 [submodule "deps/WinToast"]
 	path = deps/WinToast
 	url = https://github.com/mohabouje/WinToast.git

README.md

@@ -9,7 +9,7 @@
 # S1x: Client
 
 <p align="center">
-  <img alig src="assets/github/banner.png?raw=true" />
+  <img src="assets/github/banner.png?raw=true" />
 </p>
 
 <br/>

deps/asmjit

@@ -1 +1 @@
-Subproject commit 9cb2b298e1cdcc82cd014302cc19891bdbe4dd2b
+Subproject commit e7a728018e5d88ffa477430fa63bdebbf480fb02

src/client/component/fastfiles.cpp

@@ -56,7 +56,7 @@ namespace fastfiles
 					return;
 				}
 
-				game::XZoneInfo info;
+				game::XZoneInfo info{};
 				info.name = params.get(1);
 				info.allocFlags = 1;
 				info.freeFlags = 0;

src/client/component/party.cpp

@@ -208,17 +208,6 @@ namespace party
 				return;
 			}
 
-			if (!game::environment::is_dedi())
-			{
-				if(game::SV_Loaded())
-				{
-					const auto* args = "Leave";
-					game::UI_RunMenuScript(0, &args);
-				}
-				
-				perform_game_initialization();
-			}
-
 			auto* current_mapname = game::Dvar_FindVar("mapname");
 			if (current_mapname && utils::string::to_lower(current_mapname->current.string) ==
 				utils::string::to_lower(mapname) && (game::SV_Loaded() && !game::VirtualLobby_Loaded()))
@@ -228,6 +217,17 @@ namespace party
 				return;
 			}
 
+			if (!game::environment::is_dedi())
+			{
+				if (game::SV_Loaded())
+				{
+					const auto* args = "Leave";
+					game::UI_RunMenuScript(0, &args);
+				}
+
+				perform_game_initialization();
+			}
+
 			printf("Starting map: %s\n", mapname.data());
 
 			auto* gametype = game::Dvar_FindVar("g_gametype");
@@ -249,29 +249,22 @@ namespace party
 		}
 	}
 
-	void send_disconnect()
+	void disconnect_stub()
 	{
-		if (game::CL_IsCgameInitialized() && !game::VirtualLobby_Loaded())
+		if (!game::VirtualLobby_Loaded())
 		{
-			// CL_ForwardCommandToServer
-			reinterpret_cast<void (*)(int, const char*)>(0x14020B310)(0, "disconnect");
-			// CL_WritePacket
-			reinterpret_cast<void (*)(int)>(0x1402058F0)(0);
+			if (game::CL_IsCgameInitialized())
+			{
+				// CL_ForwardCommandToServer
+				reinterpret_cast<void (*)(int, const char*)>(0x14020B310)(0, "disconnect");
+				// CL_WritePacket
+				reinterpret_cast<void (*)(int)>(0x1402058F0)(0);
+			}
+			// CL_Disconnect
+			reinterpret_cast<void (*)(int)>(0x140209EC0)(0);
 		}
 	}
 
-	const auto disconnect_stub = utils::hook::assemble([](utils::hook::assembler& a)
-	{
-		a.pushad64();
-		a.call_aligned(send_disconnect);
-		a.popad64();
-
-		a.mov(edx, 1);
-		a.xor_(ecx, ecx);
-
-		a.jmp(0x140209EC0);
-	});
-
 	class component final : public component_interface
 	{
 	public:
@@ -283,7 +276,7 @@ namespace party
 			}
 
 			// hook disconnect command function
-			utils::hook::jump(0x14020A010, disconnect_stub, true);
+			utils::hook::jump(0x14020A010, disconnect_stub);
 
 			command::add("map", [](const command::params& argument)
 			{

src/client/component/system_check.cpp

@@ -56,7 +56,8 @@ namespace system_check
 
 			static std::unordered_map<std::string, std::string> sp_zone_hashes =
 			{
-				{"patch_common.ff", "4624A974C6C7F8BECD9C343E7951722D8378889AC08ED4F2B22459B171EC553C"},
+				// Steam doesn't necessarily deliver this file :(
+				//{"patch_common.ff", "4624A974C6C7F8BECD9C343E7951722D8378889AC08ED4F2B22459B171EC553C"},
 				{"patch_common_zm_mp.ff", "DA16B546B7233BBC4F48E1E9084B49218CB9271904EA7120A0EB4CB8723C19CF"},
 			};