From 09bc8a4ed28d762244ccae22ae6a8e6c210ea960 Mon Sep 17 00:00:00 2001
From: BobTheBob <32057864+BobTheBob9@users.noreply.github.com>
Date: Sat, 20 Aug 2022 19:19:43 +0100
Subject: allow mods to load biks that aren't already present in r2/media
 (#137)

Co-authored-by: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
---
 NorthstarDedicatedTest/clientvideooverrides.cpp | 7 ++++++-
 NorthstarDedicatedTest/clientvideooverrides.h   | 2 +-
 NorthstarDedicatedTest/dllmain.cpp              | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'NorthstarDedicatedTest')

diff --git a/NorthstarDedicatedTest/clientvideooverrides.cpp b/NorthstarDedicatedTest/clientvideooverrides.cpp
index c5989968..659bf23c 100644
--- a/NorthstarDedicatedTest/clientvideooverrides.cpp
+++ b/NorthstarDedicatedTest/clientvideooverrides.cpp
@@ -1,6 +1,7 @@
 #include "pch.h"
 #include "clientvideooverrides.h"
 #include "modmanager.h"
+#include "nsmem.h"
 
 typedef void* (*BinkOpenType)(const char* path, uint32_t flags);
 BinkOpenType BinkOpen;
@@ -31,8 +32,12 @@ void* BinkOpenHook(const char* path, uint32_t flags)
 		return BinkOpen(path, flags);
 }
 
-void InitialiseClientVideoOverrides(HMODULE baseAddress)
+void InitialiseEngineClientVideoOverrides(HMODULE baseAddress)
 {
+	// remove engine check for whether the bik we're trying to load exists in r2/media, as this will fail for biks in mods
+	// note: the check in engine is actually unnecessary, so it's just useless in practice and we lose nothing by removing it
+	NSMem::NOP((uintptr_t)baseAddress + 0x459AD, 6);
+
 	HookEnabler hook;
 	ENABLER_CREATEHOOK(
 		hook,
diff --git a/NorthstarDedicatedTest/clientvideooverrides.h b/NorthstarDedicatedTest/clientvideooverrides.h
index 8819e404..a5e961f5 100644
--- a/NorthstarDedicatedTest/clientvideooverrides.h
+++ b/NorthstarDedicatedTest/clientvideooverrides.h
@@ -1,2 +1,2 @@
 #pragma once
-void InitialiseClientVideoOverrides(HMODULE baseAddress);
\ No newline at end of file
+void InitialiseEngineClientVideoOverrides(HMODULE baseAddress);
\ No newline at end of file
diff --git a/NorthstarDedicatedTest/dllmain.cpp b/NorthstarDedicatedTest/dllmain.cpp
index 6d32034f..02b3fefc 100644
--- a/NorthstarDedicatedTest/dllmain.cpp
+++ b/NorthstarDedicatedTest/dllmain.cpp
@@ -253,7 +253,7 @@ bool InitialiseNorthstar()
 		AddDllLoadCallbackForClient("client.dll", InitialiseClientChatHooks);
 		AddDllLoadCallbackForClient("client.dll", InitialiseLocalChatWriter);
 		AddDllLoadCallbackForClient("client.dll", InitialiseScriptServerToClientStringCommands);
-		AddDllLoadCallbackForClient("client.dll", InitialiseClientVideoOverrides);
+		AddDllLoadCallbackForClient("engine.dll", InitialiseEngineClientVideoOverrides);
 		AddDllLoadCallbackForClient("engine.dll", InitialiseEngineClientRUIHooks);
 		AddDllLoadCallbackForClient("engine.dll", InitialiseDebugOverlay);
 		AddDllLoadCallbackForClient("client.dll", InitialiseClientSquirrelUtilityFunctions);
-- 
cgit v1.2.3