From a2cb0b62c8ceeb2299ebeaa65e00a3f87ba05b11 Mon Sep 17 00:00:00 2001
From: PixieCore <41352111+IcePixelx@users.noreply.github.com>
Date: Wed, 29 Jun 2022 18:25:44 +0200
Subject: [PATCH] Macro for ArraySizes and CFactory Methods are virtual now for
 later usage.

---
 r5dev/tier0/basetypes.h |  2 ++
 r5dev/tier1/IConVar.cpp |  4 ++--
 r5dev/tier1/cmd.cpp     |  2 +-
 r5dev/vpc/interfaces.h  | 10 +++++-----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/r5dev/tier0/basetypes.h b/r5dev/tier0/basetypes.h
index ed044e58..04d4d4c6 100644
--- a/r5dev/tier0/basetypes.h
+++ b/r5dev/tier0/basetypes.h
@@ -134,6 +134,8 @@
 #endif // Max BSP file name len.
 #define MAX_MAP_NAME 64
 
+#define SDK_ARRAYSIZE(arr) ((int)(sizeof(arr) / sizeof(*arr))) // Name due to IMGUI implementation and NT implementation that we shouldn't share across everywhere.
+
 #define SDK_VERSION "beta 1.6"/*"VGameSDK001"*/ // Increment this with every /breaking/ SDK change (i.e. security/backend changes breaking compatibility).
 
 #ifndef DEDICATED
diff --git a/r5dev/tier1/IConVar.cpp b/r5dev/tier1/IConVar.cpp
index 55b706b9..5f6b209f 100644
--- a/r5dev/tier1/IConVar.cpp
+++ b/r5dev/tier1/IConVar.cpp
@@ -196,7 +196,7 @@ void ConVar::PurgeShipped(void) const
 		"voice_enabled",
 	};
 
-	for (int i = 0; i < (&pszToPurge)[1] - pszToPurge; i++)
+	for (int i = 0; i < SDK_ARRAYSIZE(pszToPurge); i++)
 	{
 		ConVar* pCVar = g_pCVar->FindVar(pszToPurge[i]);
 
@@ -233,7 +233,7 @@ void ConVar::PurgeHostNames(void) const
 		"users_hostname"
 	};
 
-	for (int i = 0; i < (&pszHostNames)[1] - pszHostNames; i++)
+	for (int i = 0; i < SDK_ARRAYSIZE(pszHostNames); i++)
 	{
 		ConVar* pCVar = g_pCVar->FindVar(pszHostNames[i]);
 
diff --git a/r5dev/tier1/cmd.cpp b/r5dev/tier1/cmd.cpp
index 042aa096..bf729b1f 100644
--- a/r5dev/tier1/cmd.cpp
+++ b/r5dev/tier1/cmd.cpp
@@ -21,7 +21,7 @@ int CCommand::MaxCommandLength(void)
 //-----------------------------------------------------------------------------
 // Purpose: returns argument count
 //-----------------------------------------------------------------------------
-std::int64_t CCommand::ArgC(void) const
+int64_t CCommand::ArgC(void) const
 {
 	return m_nArgc;
 }
diff --git a/r5dev/vpc/interfaces.h b/r5dev/vpc/interfaces.h
index 33aafbbf..db6f09e2 100644
--- a/r5dev/vpc/interfaces.h
+++ b/r5dev/vpc/interfaces.h
@@ -77,11 +77,11 @@ struct FactoryInfo
 class CFactory
 {
 public:
-	void AddFactory(const string& svFactoryName, void* pFactory);
-	void AddFactory(FactoryInfo factoryInfo);
-	size_t GetVersionIndex(const string& svInterfaceName) const;
-	void GetFactoriesFromRegister(void);
-	CMemory GetFactoryPtr(const string& factoryName, bool versionLess = true) const;
+	virtual void AddFactory(const string& svFactoryName, void* pFactory);
+	virtual void AddFactory(FactoryInfo factoryInfo);
+	virtual size_t GetVersionIndex(const string& svInterfaceName) const;
+	virtual void GetFactoriesFromRegister(void);
+	virtual CMemory GetFactoryPtr(const string& svFactoryName, bool versionLess = true) const;
 
 private:
 	vector<FactoryInfo> m_vFactories;