Rename some members of MasterServerManager (#266)

This is basically 9ab7c43 from refactor but without the debug build crash fix as that was introduced in a commit in refactor not present on main Co-authored-by: BobTheBob <32057864+BobTheBob9@users.noreply.github.com>
R2Northstar · Sep 7, 2022 · 4d64528 · 4d64528
1 parent 7aa2008
commit 4d64528
Show file tree

Hide file tree

Showing 12 changed files with 193 additions and 193 deletions.
diff --git a/NorthstarDLL/NorthstarDLL.vcxproj.filters b/NorthstarDLL/NorthstarDLL.vcxproj.filters
@@ -25,9 +25,6 @@
     <Filter Include="Source Files\Shared">
       <UniqueIdentifier>{4f525372-34a8-40b3-8a95-81d77cdfcf7f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Dedicated">
-      <UniqueIdentifier>{947835db-67d6-42c0-870d-62743f85231f}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\Dedicated">
       <UniqueIdentifier>{8b8ed12a-9269-4dc3-b932-0daefdf6a388}</UniqueIdentifier>
     </Filter>
@@ -133,6 +130,9 @@
     <Filter Include="Source Files\Shared\Exploit Fixes\UTF8Parser">
       <UniqueIdentifier>{b30e08b1-b962-4264-8cbb-a0a31924b93e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\Dedicated">
+      <UniqueIdentifier>{947835db-67d6-42c0-870d-62743f85231f}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Header Files\Shared\ExploitFixes">
       <UniqueIdentifier>{7f609cee-d2c0-46a2-b06e-83b9f0511915}</UniqueIdentifier>
     </Filter>
@@ -1536,7 +1536,7 @@
       <Filter>Source Files\Shared\Hooks</Filter>
     </ClCompile>
     <ClCompile Include="dedicated.cpp">
-      <Filter>Source Files\Dedicated</Filter>
+      <Filter>Source Files\Server\Dedicated</Filter>
     </ClCompile>
     <ClCompile Include="sourceconsole.cpp">
       <Filter>Source Files\Client</Filter>
@@ -1599,7 +1599,7 @@
       <Filter>Source Files\Server</Filter>
     </ClCompile>
     <ClCompile Include="dedicatedmaterialsystem.cpp">
-      <Filter>Source Files\Dedicated</Filter>
+      <Filter>Source Files\Server\Dedicated</Filter>
     </ClCompile>
     <ClCompile Include="misccommands.cpp">
       <Filter>Source Files\Shared\Convar</Filter>

diff --git a/NorthstarDLL/dedicated.cpp b/NorthstarDLL/dedicated.cpp
@@ -30,7 +30,7 @@ struct CDedicatedExports
 
 void Sys_Printf(CDedicatedExports* dedicated, const char* msg)
 {
-	spdlog::info("[DEDICATED PRINT] {}", msg);
+	spdlog::info("[DEDICATED SERVER] {}", msg);
 }
 
 typedef void (*CHostState__InitType)(CHostState* self);
@@ -81,7 +81,7 @@ void RunServer(CDedicatedExports* dedicated)
 
 			SetConsoleTitleA(fmt::format(
 								 "{} - {} {}/{} players ({})",
-								 g_MasterServerManager->ns_auth_srvName,
+								 g_MasterServerManager->m_sUnicodeServerName,
 								 g_pHostState->m_levelName,
 								 g_ServerAuthenticationManager->m_additionalPlayerData.size(),
 								 maxPlayers,