From e281aea990d5e5e637988237bd3c8f7c72fd61af Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Tue, 24 Jan 2023 18:39:12 +0100
Subject: [PATCH] Fix client.dll/dedicated.dll compile errors

---
 r5dev/game/client/movehelper_client.h | 3 ++-
 r5dev/tier1/IConVar.cpp               | 2 +-
 r5dev/vstdlib/callback.cpp            | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/r5dev/game/client/movehelper_client.h b/r5dev/game/client/movehelper_client.h
index c4c2f853..70f9f316 100644
--- a/r5dev/game/client/movehelper_client.h
+++ b/r5dev/game/client/movehelper_client.h
@@ -10,6 +10,7 @@
 #include "tier1/utlvector.h"
 #include "public/gametrace.h"
 #include "game/shared/imovehelper.h"
+#include "c_baseplayer.h"
 
 class CMoveHelperClient : public IMoveHelper
 {
@@ -23,7 +24,7 @@ class CMoveHelperClient : public IMoveHelper
 	};
 
 	CUtlVector<touchlist_t>	m_TouchList;
-	CBaseEntity* m_pHost;
+	C_BaseEntity* m_pHost;
 };
 
 IMoveHelper* MoveHelperClient();
diff --git a/r5dev/tier1/IConVar.cpp b/r5dev/tier1/IConVar.cpp
index 4e158fa4..70ddff34 100644
--- a/r5dev/tier1/IConVar.cpp
+++ b/r5dev/tier1/IConVar.cpp
@@ -256,9 +256,9 @@ void ConVar::InitShipped(void)
 	model_defaultFadeDistMin         = g_pCVar->FindVar("model_defaultFadeDistMin");
 #ifndef DEDICATED
 	rui_defaultDebugFontFace         = g_pCVar->FindVar("rui_defaultDebugFontFace");
-#endif // !DEDICATED
 	r_visualizetraces                = g_pCVar->FindVar("r_visualizetraces");
 	r_visualizetraces_duration       = g_pCVar->FindVar("r_visualizetraces_duration");
+#endif // !DEDICATED
 	staticProp_no_fade_scalar        = g_pCVar->FindVar("staticProp_no_fade_scalar");
 	staticProp_gather_size_weight    = g_pCVar->FindVar("staticProp_gather_size_weight");
 	stream_overlay                   = g_pCVar->FindVar("stream_overlay");
diff --git a/r5dev/vstdlib/callback.cpp b/r5dev/vstdlib/callback.cpp
index dcd7aec7..b0244258 100644
--- a/r5dev/vstdlib/callback.cpp
+++ b/r5dev/vstdlib/callback.cpp
@@ -48,10 +48,10 @@
 #include "vstdlib/callback.h"
 #ifndef DEDICATED
 #include "materialsystem/cmaterialglue.h"
+#endif // !DEDICATED
 #include "public/bspflags.h"
 #include "public/cmodel.h"
 #include "public/idebugoverlay.h"
-#endif // !DEDICATED
 #ifndef CLIENT_DLL
 #include "game/server/detour_impl.h"
 #include "game/server/gameinterface.h"
@@ -1144,7 +1144,7 @@ BHit_f
 */
 void BHit_f(const CCommand& args)
 {
-#ifndef DEDICATED // Stubbed to suppress server warnings as this is a GAMEDLL command!
+#ifndef CLIENT_DLL // Stubbed to suppress server warnings as this is a GAMEDLL command!
 	if (args.ArgC() != 9)
 		return;
 
@@ -1176,7 +1176,9 @@ void BHit_f(const CCommand& args)
 		g_pDebugOverlay->AddLineOverlay(trace.startpos, trace.endpos, 0, 255, 0, !bhit_depth_test->GetBool(), sv_visualizetraces_duration->GetFloat());
 		g_pDebugOverlay->AddLineOverlay(trace.endpos, vecAbsEnd, 255, 0, 0, !bhit_depth_test->GetBool(), sv_visualizetraces_duration->GetFloat());
 	}
+#endif // !CLIENT_DLL
 
+#ifndef DEDICATED
 	if (bhit_abs_origin->GetBool() && r_visualizetraces->GetBool())
 	{
 		const int iEnt = atoi(args[2]);