1 files changed, 40 insertions, 0 deletions
diff --git a/NorthstarDedicatedTest/miscclientfixes.cpp b/NorthstarDedicatedTest/miscclientfixes.cpp
new file mode 100644
index 00000000..d9fab647
--- /dev/null
+++ b/NorthstarDedicatedTest/miscclientfixes.cpp
@@ -0,0 +1,40 @@
+#include "pch.h"
+#include "miscclientfixes.h"
+#include "hookutils.h"
+#include "dedicated.h"
+
+typedef void*(*CrashingWeaponActivityFuncType)(void* a1);
+CrashingWeaponActivityFuncType CrashingWeaponActivityFunc0;
+CrashingWeaponActivityFuncType CrashingWeaponActivityFunc1;
+
+void* CrashingWeaponActivityFunc0Hook(void* a1)
+{
+	// this return is safe, other functions that use this value seemingly dont care about it being null
+	if (!a1)
+		return 0;
+
+	return CrashingWeaponActivityFunc0(a1);
+}
+
+void* CrashingWeaponActivityFunc1Hook(void* a1)
+{
+	// this return is safe, other functions that use this value seemingly dont care about it being null
+	if (!a1)
+		return 0;
+
+	return CrashingWeaponActivityFunc1(a1);
+}
+
+void InitialiseMiscClientFixes(HMODULE baseAddress)
+{
+	if (IsDedicated())
+		return;
+
+	HookEnabler hook;
+
+	// these functions will occasionally pass a null pointer on respawn, unsure what causes this but seems easiest just to return null if null, which seems to work fine
+	// fucking sucks this has to be fixed like this but unsure what exactly causes this serverside, breaks vanilla compatibility to a degree tho
+	// will say i have about 0 clue what exactly these functions do, testing this it doesn't even seem like they do much of anything i can see tbh
+	ENABLER_CREATEHOOK(hook, (char*)baseAddress + 0x5A92D0, &CrashingWeaponActivityFunc0Hook, reinterpret_cast<LPVOID*>(&CrashingWeaponActivityFunc0));
+	ENABLER_CREATEHOOK(hook, (char*)baseAddress + 0x5A9310, &CrashingWeaponActivityFunc1Hook, reinterpret_cast<LPVOID*>(&CrashingWeaponActivityFunc1));
+}
+\ No newline at end of file