From 6e32464519d371a56101ec07a741bf3443f9bc4a Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Tue, 31 Jan 2023 22:30:45 +0100
Subject: [PATCH] Rename 's_bDedicated' to 's_bIsDedicated'

's_bIsDedicated' is the original name (see TRACEINIT in game executable).
---
 r5dev/common/opcodes.cpp      | 2 +-
 r5dev/engine/server/sv_main.h | 6 +++---
 r5dev/squirrel/sqinit.cpp     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/r5dev/common/opcodes.cpp b/r5dev/common/opcodes.cpp
index 25487d15..039970b7 100644
--- a/r5dev/common/opcodes.cpp
+++ b/r5dev/common/opcodes.cpp
@@ -41,7 +41,7 @@
  //-------------------------------------------------------------------------
 void Dedicated_Init()
 {
-	*s_bDedicated = true;
+	*s_bIsDedicated = true;
 //	//-------------------------------------------------------------------------
 //	// CGAME
 //	//-------------------------------------------------------------------------
diff --git a/r5dev/engine/server/sv_main.h b/r5dev/engine/server/sv_main.h
index f61e0992..0beff5d5 100644
--- a/r5dev/engine/server/sv_main.h
+++ b/r5dev/engine/server/sv_main.h
@@ -17,7 +17,7 @@ inline auto SV_CreateBaseline = p_SV_CreateBaseline.RCast<bool(*)(void)>();
 inline CMemory p_CGameServer__SpawnServer;
 inline auto CGameServer__SpawnServer = p_CGameServer__SpawnServer.RCast<bool(*)(void* thisptr, const char* pszMapName, const char* pszMapGroupName)>();
 
-inline bool* s_bDedicated = nullptr;
+inline bool* s_bIsDedicated = nullptr;
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -33,7 +33,7 @@ class HSV_Main : public IDetour
 		LogFunAdr("SV_InitGameDLL", p_SV_InitGameDLL.GetPtr());
 		LogFunAdr("SV_ShutdownGameDLL", p_SV_ShutdownGameDLL.GetPtr());
 		LogFunAdr("SV_CreateBaseline", p_SV_CreateBaseline.GetPtr());
-		LogVarAdr("s_bDedicated", reinterpret_cast<uintptr_t>(s_bDedicated));
+		LogVarAdr("s_bIsDedicated", reinterpret_cast<uintptr_t>(s_bIsDedicated));
 	}
 	virtual void GetFun(void) const
 	{
@@ -53,7 +53,7 @@ class HSV_Main : public IDetour
 	}
 	virtual void GetVar(void) const
 	{
-		s_bDedicated = g_GameDll.FindPatternSIMD("48 89 4C 24 ?? 48 89 54 24 ?? 4C 89 44 24 ?? 4C 89 4C 24 ?? 53 57 B8 ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 2B E0 48 8B D9 48 8D BC 24 ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 89 7C 24 ?? 48 8D 54 24 ?? 33 FF")
+		s_bIsDedicated = g_GameDll.FindPatternSIMD("48 89 4C 24 ?? 48 89 54 24 ?? 4C 89 44 24 ?? 4C 89 4C 24 ?? 53 57 B8 ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 2B E0 48 8B D9 48 8D BC 24 ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 89 7C 24 ?? 48 8D 54 24 ?? 33 FF")
 			.FindPatternSelf("40 38 3D", CMemory::Direction::DOWN).ResolveRelativeAddressSelf(0x3, 0x7).RCast<bool*>();
 	}
 	virtual void GetCon(void) const { }
diff --git a/r5dev/squirrel/sqinit.cpp b/r5dev/squirrel/sqinit.cpp
index d8014806..6904d825 100644
--- a/r5dev/squirrel/sqinit.cpp
+++ b/r5dev/squirrel/sqinit.cpp
@@ -198,7 +198,7 @@ namespace VSquirrel
         //-----------------------------------------------------------------------------
         SQRESULT IsDedicated(HSQUIRRELVM v)
         {
-            sq_pushbool(v, *s_bDedicated);
+            sq_pushbool(v, *s_bIsDedicated);
             return SQ_OK;
         }
     }