diff options
| author | p0358 <p0358@users.noreply.github.com> | 2021-12-31 22:46:45 +0100 |
|---|---|---|
| committer | p0358 <p0358@users.noreply.github.com> | 2021-12-31 22:46:45 +0100 |
| commit | 9b13df7bc6f4c09c3fdab27cd51fe76d30b756b8 (patch) | |
| tree | d273fbc7942b46497f056fd9c68b8b21e6d19fee /NorthstarDedicatedTest/masterserver.cpp | |
| parent | dcba96bcc4b02639e859b0dcdc863391cb54684f (diff) | |
| download | NorthstarLauncher-9b13df7bc6f4c09c3fdab27cd51fe76d30b756b8.tar.gz NorthstarLauncher-9b13df7bc6f4c09c3fdab27cd51fe76d30b756b8.zip | |
some post-merge changes combined with my local changes
Diffstat (limited to 'NorthstarDedicatedTest/masterserver.cpp')
| -rw-r--r-- | NorthstarDedicatedTest/masterserver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/NorthstarDedicatedTest/masterserver.cpp b/NorthstarDedicatedTest/masterserver.cpp index 2fec6c82..e25be8ab 100644 --- a/NorthstarDedicatedTest/masterserver.cpp +++ b/NorthstarDedicatedTest/masterserver.cpp @@ -1022,9 +1022,9 @@ void CHostState__State_GameShutdownHook(CHostState* hostState) CHostState__State_GameShutdown(hostState); } -MasterServerManager::MasterServerManager() +MasterServerManager::MasterServerManager() : m_pendingConnectionInfo{}, m_ownServerId{ "" }, m_ownClientAuthToken{ "" } { - curl_global_init_mem(CURL_GLOBAL_DEFAULT, _malloc_base, _free_base, _realloc_base, _strdup_base, _calloc_base); + } void InitialiseSharedMasterServer(HMODULE baseAddress) |