refactor dll load callbacks to lower number of dedicated.h includes (#109)

1 files changed, 5 insertions, 4 deletions

diff --git a/NorthstarDedicatedTest/rpakfilesystem.cpp b/NorthstarDedicatedTest/rpakfilesystem.cpp
index a4c4fada..ba7cf3d2 100644
--- a/NorthstarDedicatedTest/rpakfilesystem.cpp
+++ b/NorthstarDedicatedTest/rpakfilesystem.cpp
@@ -7,7 +7,7 @@ typedef void* (*LoadCommonPaksForMapType)(char* map);
 LoadCommonPaksForMapType LoadCommonPaksForMap;
 
 typedef void* (*LoadPakSyncType)(const char* path, void* unknownSingleton, int flags);
-typedef void* (*LoadPakAsyncType)(const char* path, void* unknownSingleton, int flags, void* callback0, void* callback1);
+typedef int(*LoadPakAsyncType)(const char* path, void* unknownSingleton, int flags, void* callback0, void* callback1);
 
 // there are more i'm just too lazy to add
 struct PakLoadFuncs
@@ -76,15 +76,16 @@ void* LoadPakSyncHook(char* path, void* unknownSingleton, int flags)
 }
 
 LoadPakAsyncType LoadPakAsyncOriginal;
-void* LoadPakAsyncHook(char* path, void* unknownSingleton, int flags, void* callback0, void* callback1)
+int LoadPakAsyncHook(char* path, void* unknownSingleton, int flags, void* callback0, void* callback1)
 {
 	HandlePakAliases(&path);
 
 	if (bShouldPreload)
 		LoadPreloadPaks();
 
-	spdlog::info("LoadPakAsync {}", path);
-	return LoadPakAsyncOriginal(path, unknownSingleton, flags, callback0, callback1);
+	int ret = LoadPakAsyncOriginal(path, unknownSingleton, flags, callback0, callback1);
+	spdlog::info("LoadPakAsync {} {}", path, ret);
+	return ret;
 }
 
 void InitialiseEngineRpakFilesystem(HMODULE baseAddress)