diff options
| author | geni <me@geni.site> | 2021-12-31 16:07:09 +0200 |
|---|---|---|
| committer | geni <me@geni.site> | 2021-12-31 16:07:09 +0200 |
| commit | d658c0c8374f8491e062fabe031f79185169c414 (patch) | |
| tree | 99d129460365774ae011d83b3765e7d9388c44a7 | |
| parent | e98e1a44aaa04f45b5cee415a882ab2d79942b7f (diff) | |
| download | NorthstarLauncher-d658c0c8374f8491e062fabe031f79185169c414.tar.gz NorthstarLauncher-d658c0c8374f8491e062fabe031f79185169c414.zip | |
Clean up
| -rw-r--r-- | LauncherInjector/LauncherInjector.vcxproj | 1 | ||||
| -rw-r--r-- | LauncherInjector/LauncherInjector.vcxproj.filters | 3 | ||||
| -rw-r--r-- | NorthstarDedicatedTest/dllmain.cpp | 7 | ||||
| -rw-r--r-- | NorthstarDedicatedTest/memalloc.h | 2 |
4 files changed, 3 insertions, 10 deletions
diff --git a/LauncherInjector/LauncherInjector.vcxproj b/LauncherInjector/LauncherInjector.vcxproj index 30fa690e..8870c732 100644 --- a/LauncherInjector/LauncherInjector.vcxproj +++ b/LauncherInjector/LauncherInjector.vcxproj @@ -90,7 +90,6 @@ <ClCompile Include="main.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="memalloc.h" /> <ClInclude Include="resource1.h" /> </ItemGroup> <ItemGroup> diff --git a/LauncherInjector/LauncherInjector.vcxproj.filters b/LauncherInjector/LauncherInjector.vcxproj.filters index 449381ca..87e25fa8 100644 --- a/LauncherInjector/LauncherInjector.vcxproj.filters +++ b/LauncherInjector/LauncherInjector.vcxproj.filters @@ -23,9 +23,6 @@ <ClInclude Include="resource1.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="memalloc.h"> - <Filter>Header Files</Filter> - </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="resources.rc"> 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; |