aboutsummaryrefslogtreecommitdiff
path: root/NorthstarDLL/masterserver.cpp
diff options
context:
space:
mode:
authorMaya <malte.hoermeyer@web.de>2022-08-23 03:54:54 +0200
committerGitHub <noreply@github.com>2022-08-23 02:54:54 +0100
commit4f6f182d26094b7b7512d656b5085f80e8af3dc9 (patch)
tree0a30acbb9c3f47f67887834620e5c182b7b46e09 /NorthstarDLL/masterserver.cpp
parent86ea43ef2c32104f92e12c80231ff9271ebeb6e2 (diff)
downloadNorthstarLauncher-4f6f182d26094b7b7512d656b5085f80e8af3dc9.tar.gz
NorthstarLauncher-4f6f182d26094b7b7512d656b5085f80e8af3dc9.zip
Add ability to load Datatables from files (#238)
* first version of kinda working custom datatables * Fix copy error * Finish custom datatables * Fix Merge * Fix line endings * Add fallback to rpak when ns_prefere_datatable_from_disk is true * fix typo * Bug fixess * Fix Function Registration hook * Set convar value * Fix Client and Ui VM * enable server auth with ms agian * Add Filters * FIx unused import * Merge remote-tracking branch 'upsteam/bobs-big-refactor-pr' into datatables Co-authored-by: RoyalBlue1 <realEmail@veryRealURL.com>
Diffstat (limited to 'NorthstarDLL/masterserver.cpp')
-rw-r--r--NorthstarDLL/masterserver.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/NorthstarDLL/masterserver.cpp b/NorthstarDLL/masterserver.cpp
index b83170b0..04656b33 100644
--- a/NorthstarDLL/masterserver.cpp
+++ b/NorthstarDLL/masterserver.cpp
@@ -764,6 +764,7 @@ class MasterServerPresenceReporter : public ServerPresenceReporter
void ReportPresence(const ServerPresence* pServerPresence) override
{
// make a copy of presence for multithreading purposes
+
ServerPresence threadedPresence(pServerPresence);
if (!*g_pMasterServerManager->m_sOwnServerId || m_bShouldTryRegisterServer)