From fb7f77f7cb97f0ec788dd20f1ff621304e7472aa Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Thu, 13 Oct 2022 02:41:09 +0200
Subject: [PATCH] Fix dedicated.dll compile errors

---
 r5dev/materialsystem/cmaterialglue.h     | 9 +++++++++
 r5dev/materialsystem/cmaterialsystem.cpp | 2 ++
 r5dev/materialsystem/cmaterialsystem.h   | 6 +++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/r5dev/materialsystem/cmaterialglue.h b/r5dev/materialsystem/cmaterialglue.h
index 70abebe0..0fb2a161 100644
--- a/r5dev/materialsystem/cmaterialglue.h
+++ b/r5dev/materialsystem/cmaterialglue.h
@@ -1,4 +1,5 @@
 #pragma once
+#ifndef DEDICATED
 #include "materialsystem/cshaderglue.h"
 #include "public/imaterialinternal.h"
 #include "public/materialsystem/shader_vcs_version.h"
@@ -60,12 +61,16 @@ public:
 }; //Size: 0x0130 confirmed end size.
 static_assert(sizeof(CMaterialGlue) == 0x130);
 #pragma pack(pop)
+#endif // !DEDICATED
 
 inline void* g_pMaterialGlueVFTable = nullptr;
 
+
 /* ==== CMATERIALGLUE ================================================================================================================================================== */
+#ifndef DEDICATED
 inline CMemory p_GetMaterialAtCrossHair;
 inline auto GetMaterialAtCrossHair = p_GetMaterialAtCrossHair.RCast<CMaterialGlue* (*)(void)>();
+#endif // !DEDICATED
 
 void CMaterialGlue_Attach();
 void CMaterialGlue_Detach();
@@ -74,14 +79,18 @@ class VMaterialGlue : public IDetour
 {
 	virtual void GetAdr(void) const
 	{
+#ifndef DEDICATED
 		spdlog::debug("| FUN: CMaterialGlue::GetMaterialAtCrossHair: {:#18x} |\n", p_GetMaterialAtCrossHair.GetPtr());
+#endif // !DEDICATED
 		spdlog::debug("| CON: g_pMaterialGlueVFTable               : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pMaterialGlueVFTable));
 		spdlog::debug("+----------------------------------------------------------------+\n");
 	}
 	virtual void GetFun(void) const
 	{
+#ifndef DEDICATED
 		p_GetMaterialAtCrossHair = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x8B\xC4\x48\x83\xEC\x58\x48\x83\x3D\x00\x00\x00\x00\x00"), "xxxxxxxxxx?????");
 		GetMaterialAtCrossHair = p_GetMaterialAtCrossHair.RCast<CMaterialGlue* (*)(void)>(); /*48 8B C4 48 83 EC 58 48 83 3D ? ? ? ? ?*/
+#endif // !DEDICATED
 	}
 	virtual void GetVar(void) const { }
 	virtual void GetCon(void) const
diff --git a/r5dev/materialsystem/cmaterialsystem.cpp b/r5dev/materialsystem/cmaterialsystem.cpp
index a8deb0eb..9b05ad18 100644
--- a/r5dev/materialsystem/cmaterialsystem.cpp
+++ b/r5dev/materialsystem/cmaterialsystem.cpp
@@ -113,6 +113,7 @@ bool IsMaterialInternal(void** pCandidate)
 	return false;
 }
 
+#ifndef DEDICATED
 //-----------------------------------------------------------------------------
 // Purpose: finds a material
 // Input  : *pMatSys - 
@@ -131,6 +132,7 @@ CMaterialGlue* CMaterialSystem::FindMaterialEx(CMaterialSystem* pMatSys, const c
 	}
 	return pMaterial;
 }
+#endif // !DEDICATED
 
 ///////////////////////////////////////////////////////////////////////////////
 void CMaterialSystem_Attach()
diff --git a/r5dev/materialsystem/cmaterialsystem.h b/r5dev/materialsystem/cmaterialsystem.h
index 69b14586..701c1eba 100644
--- a/r5dev/materialsystem/cmaterialsystem.h
+++ b/r5dev/materialsystem/cmaterialsystem.h
@@ -1,5 +1,7 @@
-#pragma once
+#ifndef MATERIALSYSTEM_H
+#define MATERIALSYSTEM_H
 #include "cmaterialglue.h"
+
 #define STREAM_DB_EXT "stbsp"
 
 class CMaterialSystem
@@ -98,3 +100,5 @@ class VMaterialSystem : public IDetour
 ///////////////////////////////////////////////////////////////////////////////
 
 REGISTER(VMaterialSystem);
+
+#endif // MATERIALSYSTEM_H
\ No newline at end of file