From 73cdaf18e3ae0fa4077fea16fac2eec51a44b7fe Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Mon, 28 Mar 2022 12:02:11 +0200
Subject: [PATCH] Slight cleanup

---
 r5dev/engine/baseserver.cpp | 8 +++-----
 r5dev/engine/baseserver.h   | 3 +--
 r5dev/engine/host_state.cpp | 8 ++++++--
 r5dev/squirrel/sqinit.cpp   | 5 ++++-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/r5dev/engine/baseserver.cpp b/r5dev/engine/baseserver.cpp
index 0c5cb136..466731fc 100644
--- a/r5dev/engine/baseserver.cpp
+++ b/r5dev/engine/baseserver.cpp
@@ -16,8 +16,7 @@
 
 //---------------------------------------------------------------------------------
 // Purpose: Gets the number of human players on the server
-// Output : int64_t
-// !TODO  : Rebuild properly..
+// Output : int
 //---------------------------------------------------------------------------------
 int CBaseServer::GetNumHumanPlayers(void) const
 {
@@ -28,7 +27,7 @@ int CBaseServer::GetNumHumanPlayers(void) const
         if (!client)
             continue;
 
-        if (client->IsConnected())
+        if (client->IsHumanPlayer())
             nHumans++;
     }
 
@@ -37,8 +36,7 @@ int CBaseServer::GetNumHumanPlayers(void) const
 
 //---------------------------------------------------------------------------------
 // Purpose: Gets the number of fake clients on the server
-// Output : int64_t
-// !TODO  : Rebuild properly..
+// Output : int
 //---------------------------------------------------------------------------------
 int CBaseServer::GetNumFakeClients(void) const
 {
diff --git a/r5dev/engine/baseserver.h b/r5dev/engine/baseserver.h
index 4c20baa2..a7f0f5de 100644
--- a/r5dev/engine/baseserver.h
+++ b/r5dev/engine/baseserver.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "engine/baseclient.h"
 
 namespace
 {
@@ -21,7 +20,7 @@ class HBaseServer : public IDetour
 	{
 		//std::cout << "| VAR: g_dwMaxClients                       : 0x" << std::hex << std::uppercase << g_dwMaxClients     << std::setw(0) << " |" << std::endl;
 		//std::cout << "| VAR: g_dwMaxFakeClients                   : 0x" << std::hex << std::uppercase << g_dwMaxFakeClients << std::setw(0) << " |" << std::endl;
-		std::cout << "+----------------------------------------------------------------+" << std::endl;
+		//std::cout << "+----------------------------------------------------------------+" << std::endl;
 	}
 };
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/r5dev/engine/host_state.cpp b/r5dev/engine/host_state.cpp
index 3c3f6a27..c251c1ea 100644
--- a/r5dev/engine/host_state.cpp
+++ b/r5dev/engine/host_state.cpp
@@ -155,8 +155,8 @@ FORCEINLINE void CHostState::Setup(void) const
 	g_pRConClient->Init();
 #endif // DEDICATED
 
-	std::thread t1(&CHostState::Think, this);
-	t1.detach();
+	std::thread think(&CHostState::Think, this);
+	think.detach();
 
 	*reinterpret_cast<bool*>(m_bRestrictServerCommands) = true; // Restrict commands.
 	ConCommandBase* disconnect = g_pCVar->FindCommandBase("disconnect");
@@ -231,8 +231,10 @@ FORCEINLINE void CHostState::LoadConfig(void) const
 {
 	if (!g_pCmdLine->CheckParm("-devsdk"))
 	{
+#ifndef CLIENT_DLL
 		Cbuf_AddText(Cbuf_GetCurrentPlayer(), "exec \"autoexec_server.cfg\"", cmd_source_t::kCommandSrcCode);
 		Cbuf_AddText(Cbuf_GetCurrentPlayer(), "exec \"rcon_server.cfg\"", cmd_source_t::kCommandSrcCode);
+#endif //!CLIENT_DLL
 #ifndef DEDICATED
 		Cbuf_AddText(Cbuf_GetCurrentPlayer(), "exec \"autoexec_client.cfg\"", cmd_source_t::kCommandSrcCode);
 		Cbuf_AddText(Cbuf_GetCurrentPlayer(), "exec \"rcon_client.cfg\"", cmd_source_t::kCommandSrcCode);
@@ -241,8 +243,10 @@ FORCEINLINE void CHostState::LoadConfig(void) const
 	}
 	else // Development configs.
 	{
+#ifndef CLIENT_DLL
 		Cbuf_AddText(Cbuf_GetCurrentPlayer(), "exec \"autoexec_server_dev.cfg\"", cmd_source_t::kCommandSrcCode);
 		Cbuf_AddText(Cbuf_GetCurrentPlayer(), "exec \"rcon_server_dev.cfg\"", cmd_source_t::kCommandSrcCode);
+#endif //!CLIENT_DLL
 #ifndef DEDICATED
 		Cbuf_AddText(Cbuf_GetCurrentPlayer(), "exec \"autoexec_client_dev.cfg\"", cmd_source_t::kCommandSrcCode);
 		Cbuf_AddText(Cbuf_GetCurrentPlayer(), "exec \"rcon_client_dev.cfg\"", cmd_source_t::kCommandSrcCode);
diff --git a/r5dev/squirrel/sqinit.cpp b/r5dev/squirrel/sqinit.cpp
index 8f52c9b1..6bfc007d 100644
--- a/r5dev/squirrel/sqinit.cpp
+++ b/r5dev/squirrel/sqinit.cpp
@@ -6,7 +6,8 @@
 // 
 // Create functions here under the target VM namespace. If the function has to
 // be registered for 2 or more VM's, put them under the 'SHARED' namespace. 
-// Ifdef them out for 'DEDICATED' if the target VM's do not include 'SERVER'.
+// Ifdef them out for 'DEDICATED' / 'CLIENT_DLL' if the target VM's do not 
+// include 'SERVER' / 'CLIENT'.
 //
 //=============================================================================//
 
@@ -29,9 +30,11 @@ namespace VSquirrel
             return SQ_OK;
         }
     }
+#ifndef CLIENT_DLL
     namespace SERVER
     {
     }
+#endif // !CLIENT_DLL
 #ifndef DEDICATED
     namespace CLIENT
     {