Merge pull request #1 from geniiii/p0358-refactor-fixes

Fixes, removal of fallback linear allocator

1 files changed, 4 insertions, 8 deletions

diff --git a/NorthstarDedicatedTest/dllmain.cpp b/NorthstarDedicatedTest/dllmain.cpp
index 691c9bc7..81bae847 100644
--- a/NorthstarDedicatedTest/dllmain.cpp
+++ b/NorthstarDedicatedTest/dllmain.cpp
@@ -58,33 +58,29 @@ void WaitForDebugger(HMODULE baseAddress)
     if (strstr(GetCommandLineA(), "-waitfordebugger"))
     {
         spdlog::info("waiting for debugger...");
-        spdlog::info("{} bytes have been statically allocated", g_iStaticAllocated);
 
         while (!IsDebuggerPresent())
             Sleep(100);
     }
 }
 
-SourceAllocator* g_SourceAllocator;
-
 bool InitialiseNorthstar()
 {
     if (initialised)
     {
-        fprintf(stderr, "[info] Called InitialiseNorthstar more than once!\n");
+        spdlog::warn("Called InitialiseNorthstar more than once!");
         return false;
     }
     initialised = true;
 
+    curl_global_init(CURL_GLOBAL_DEFAULT);
+
     InitialiseLogging();
 
     // apply initial hooks
     InstallInitialHooks();
     InitialiseInterfaceCreationHooks();
 
-    g_SourceAllocator = new SourceAllocator;
-
-    AddDllLoadCallback("tier0.dll", InitialiseTier0GameUtilFunctions);
     AddDllLoadCallback("engine.dll", WaitForDebugger);
     AddDllLoadCallback("engine.dll", InitialiseEngineGameUtilFunctions);
     AddDllLoadCallback("server.dll", InitialiseServerGameUtilFunctions);
@@ -92,8 +88,8 @@ bool InitialiseNorthstar()
 
     // dedi patches
     {
+        AddDllLoadCallback("launcher.dll", InitialiseDedicatedOrigin);
         AddDllLoadCallback("engine.dll", InitialiseDedicated);
-        AddDllLoadCallback("tier0.dll", InitialiseDedicatedOrigin);
         AddDllLoadCallback("server.dll", InitialiseDedicatedServerGameDLL);
         AddDllLoadCallback("materialsystem_dx11.dll", InitialiseDedicatedMaterialSystem);
         // this fucking sucks, but seemingly we somehow load after rtech_game???? unsure how, but because of this we have to apply patches here, not on rtech_game load