aboutsummaryrefslogtreecommitdiff
path: root/NorthstarDedicatedTest
diff options
context:
space:
mode:
Diffstat (limited to 'NorthstarDedicatedTest')
-rw-r--r--NorthstarDedicatedTest/dllmain.cpp7
-rw-r--r--NorthstarDedicatedTest/memalloc.h2
2 files changed, 3 insertions, 6 deletions
diff --git a/NorthstarDedicatedTest/dllmain.cpp b/NorthstarDedicatedTest/dllmain.cpp
index 07741801..81bae847 100644
--- a/NorthstarDedicatedTest/dllmain.cpp
+++ b/NorthstarDedicatedTest/dllmain.cpp
@@ -64,8 +64,6 @@ void WaitForDebugger(HMODULE baseAddress)
}
}
-SourceAllocator* g_SourceAllocator;
-
bool InitialiseNorthstar()
{
if (initialised)
@@ -75,15 +73,14 @@ bool InitialiseNorthstar()
}
initialised = true;
+ curl_global_init(CURL_GLOBAL_DEFAULT);
+
InitialiseLogging();
// apply initial hooks
InstallInitialHooks();
InitialiseInterfaceCreationHooks();
- g_SourceAllocator = new SourceAllocator;
- curl_global_init(CURL_GLOBAL_DEFAULT);
-
AddDllLoadCallback("engine.dll", WaitForDebugger);
AddDllLoadCallback("engine.dll", InitialiseEngineGameUtilFunctions);
AddDllLoadCallback("server.dll", InitialiseServerGameUtilFunctions);
diff --git a/NorthstarDedicatedTest/memalloc.h b/NorthstarDedicatedTest/memalloc.h
index 86d2ff58..b98fe3c8 100644
--- a/NorthstarDedicatedTest/memalloc.h
+++ b/NorthstarDedicatedTest/memalloc.h
@@ -35,7 +35,7 @@ public:
static void Free(void* ptr) { _free_base(ptr); }
};
-extern SourceAllocator* g_SourceAllocator;
+static SourceAllocator g_SourceAllocator;
typedef rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::MemoryPoolAllocator<SourceAllocator>, SourceAllocator> rapidjson_document;
//typedef rapidjson::GenericDocument<rapidjson::UTF8<>, SourceAllocator, SourceAllocator> rapidjson_document;