diff options
| author | GeckoEidechse <gecko.eidechse+git@pm.me> | 2022-09-12 23:16:48 +0200 |
|---|---|---|
| committer | GeckoEidechse <gecko.eidechse+git@pm.me> | 2022-09-12 23:16:48 +0200 |
| commit | 88c82bc30fe11fcfa28646bb2720266e023e2e23 (patch) | |
| tree | 885f6254746376d3e5fc8f939946634d836f3717 | |
| parent | 46bed8d09f32360377350d71816a76abdfbf2c7c (diff) | |
| download | NorthstarLauncher-88c82bc30fe11fcfa28646bb2720266e023e2e23.tar.gz NorthstarLauncher-88c82bc30fe11fcfa28646bb2720266e023e2e23.zip | |
Revert "allow mods to load biks that aren't already present in r2/media (#137)"
This reverts commit 09bc8a4ed28d762244ccae22ae6a8e6c210ea960.
| -rw-r--r-- | NorthstarDLL/clientvideooverrides.cpp | 7 | ||||
| -rw-r--r-- | NorthstarDLL/clientvideooverrides.h | 2 | ||||
| -rw-r--r-- | NorthstarDLL/dllmain.cpp | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/NorthstarDLL/clientvideooverrides.cpp b/NorthstarDLL/clientvideooverrides.cpp index 659bf23c..c5989968 100644 --- a/NorthstarDLL/clientvideooverrides.cpp +++ b/NorthstarDLL/clientvideooverrides.cpp @@ -1,7 +1,6 @@ #include "pch.h" #include "clientvideooverrides.h" #include "modmanager.h" -#include "nsmem.h" typedef void* (*BinkOpenType)(const char* path, uint32_t flags); BinkOpenType BinkOpen; @@ -32,12 +31,8 @@ void* BinkOpenHook(const char* path, uint32_t flags) return BinkOpen(path, flags); } -void InitialiseEngineClientVideoOverrides(HMODULE baseAddress) +void InitialiseClientVideoOverrides(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/NorthstarDLL/clientvideooverrides.h b/NorthstarDLL/clientvideooverrides.h index a5e961f5..8819e404 100644 --- a/NorthstarDLL/clientvideooverrides.h +++ b/NorthstarDLL/clientvideooverrides.h @@ -1,2 +1,2 @@ #pragma once -void InitialiseEngineClientVideoOverrides(HMODULE baseAddress);
\ No newline at end of file +void InitialiseClientVideoOverrides(HMODULE baseAddress);
\ No newline at end of file diff --git a/NorthstarDLL/dllmain.cpp b/NorthstarDLL/dllmain.cpp index 02b3fefc..6d32034f 100644 --- a/NorthstarDLL/dllmain.cpp +++ b/NorthstarDLL/dllmain.cpp @@ -253,7 +253,7 @@ bool InitialiseNorthstar() AddDllLoadCallbackForClient("client.dll", InitialiseClientChatHooks); AddDllLoadCallbackForClient("client.dll", InitialiseLocalChatWriter); AddDllLoadCallbackForClient("client.dll", InitialiseScriptServerToClientStringCommands); - AddDllLoadCallbackForClient("engine.dll", InitialiseEngineClientVideoOverrides); + AddDllLoadCallbackForClient("client.dll", InitialiseClientVideoOverrides); AddDllLoadCallbackForClient("engine.dll", InitialiseEngineClientRUIHooks); AddDllLoadCallbackForClient("engine.dll", InitialiseDebugOverlay); AddDllLoadCallbackForClient("client.dll", InitialiseClientSquirrelUtilityFunctions); |