Optimize far-jump patches

deps/protobuf

@@ -1 +1 @@
-Subproject commit 028d59fccda7a94c3fd39095261caceb77456af3
+Subproject commit caf1fb7197ee94c07108fc7cfbca07432b185a28

premake5.lua

@@ -110,6 +110,7 @@ workspace "iw4x"
 			}
 			buildoptions {
 				"/wd4100", -- "Unused formal parameter"
+				"/wd6011", -- "Dereferencing NULL pointer"
 			}
 			defines {
 				"_SCL_SECURE_NO_WARNINGS",

src/Components/Modules/Network.cpp

@@ -242,7 +242,7 @@ namespace Components
 		Utils::Hook(0x5AA709, Network::PacketInterceptionHandler, HOOK_CALL).Install()->Quick();
 
 		// Install packet deploy hook
-		Utils::Hook::Set<int>(0x5AA715, (DWORD)Network::DeployPacketStub - 0x5AA713 - 6);
+		Utils::Hook::RedirectJump(0x5AA713, Network::DeployPacketStub);
 	}
 
 	Network::~Network()

src/Components/Modules/UIScript.cpp

@@ -122,7 +122,7 @@ namespace Components
 	UIScript::UIScript()
 	{
 		// Install handler
-		Utils::Hook::Set<int>(0x45EC5B, (DWORD)UIScript::RunMenuScriptStub - 0x45EC59 - 6);
+		Utils::Hook::RedirectJump(0x45EC59, UIScript::RunMenuScriptStub);
 
 		// Install ownerdraw handler
 		Utils::Hook(0x63D233, UIScript::OwnerDrawHandleKeyStub, HOOK_CALL).Install()->Quick();

src/Proto/node.proto

@@ -2,8 +2,9 @@ syntax = "proto3";
 
 package Proto;
 
-message NodePacket {
-  bytes challenge = 1;
-  bytes signature = 2;
-  bytes publicKey = 3;
+message NodePacket 
+{
+	bytes challenge = 1;
+	bytes signature = 2;
+	bytes publicKey = 3;
 }

src/Utils/Hooking.cpp

@@ -131,4 +131,16 @@ namespace Utils
 	{
 		Hook::SetString(reinterpret_cast<void*>(place), string);
 	}
+
+	void Hook::RedirectJump(void* place, void* stub)
+	{
+		char* operandPtr = static_cast<char*>(place) + 2;
+		int newOperand = reinterpret_cast<int>(stub) - (reinterpret_cast<int>(place) + 6);
+		Utils::Hook::Set<int>(operandPtr, newOperand);
+	}
+
+	void Hook::RedirectJump(DWORD place, void* stub)
+	{
+		Hook::RedirectJump(reinterpret_cast<void*>(place), stub);
+	}
 }

src/Utils/Hooking.hpp

@@ -44,6 +44,9 @@ namespace Utils
 		static void Nop(void* place, size_t length);
 		static void Nop(DWORD place, size_t length);
 
+		static void RedirectJump(void* place, void* stub);
+		static void RedirectJump(DWORD place, void* stub);
+
 		template <typename T> static void Set(void* place, T value)
 		{
 			*static_cast<T*>(place) = value;