Change VFTavle indexes from read only to contant

r5dev/client/cdll_engine_int.h

@@ -37,7 +37,7 @@ public:
 
 	void* /* CUserCmd* */ GetUserCmd(int sequenceNumber) // @0x1405BB020 in R5pc_r5launch_N1094_CL456479_2019_10_30_05_20_PM
 	{
-		const int index = 28;
+		const static int index = 28;
 		return CallVFunc<void*>(index, this, sequenceNumber); /*48 83 EC 28 48 8B 05 ? ? ? ? 48 8D 0D ? ? ? ? 44 8B C2*/
 	}
 };

r5dev/client/vengineclient_impl.cpp

@@ -56,9 +56,9 @@ bool CEngineClient::GetRestrictClientCommands() const
 int CEngineClient::GetLocalPlayer()
 {
 #if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
-	const int index = 35;
+	const static int index = 35;
 #elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
-	const int index = 36;
+	const static int index = 36;
 #endif
 	return CallVFunc<int>(index, this);
 }

r5dev/engine/sys_engine.cpp

@@ -11,7 +11,7 @@ CEngine* g_pEngine = nullptr;
 //-----------------------------------------------------------------------------
 bool CEngine::Load(bool dedicated, const char* rootDir)
 {
-	const int index = 1;
+	const static int index = 1;
 	return CallVFunc<bool>(index, this, dedicated, rootDir);
 }
 
@@ -20,7 +20,7 @@ bool CEngine::Load(bool dedicated, const char* rootDir)
 //-----------------------------------------------------------------------------
 void CEngine::Unload(void)
 {
-	const int index = 2;
+	const static int index = 2;
 	CallVFunc<void>(index, this);
 }
 
@@ -45,7 +45,7 @@ EngineState_t CEngine::GetState(void) const
 //-----------------------------------------------------------------------------
 void CEngine::Frame(void)
 {
-	const int index = 5;
+	const static int index = 5;
 	CallVFunc<void>(index, this);
 }
 
@@ -62,7 +62,7 @@ float CEngine::GetFrameTime(void) const
 //-----------------------------------------------------------------------------
 float CEngine::GetPreviousTime(void) // I'm not sure if this is right, should double check.
 {
-	const int index = 7;
+	const static int index = 7;
 	return CallVFunc<float>(index, this);
 }
 
@@ -79,7 +79,7 @@ __m128 __fastcall CEngine::GetCurTime(CEngine *thisPtr) const
 //-----------------------------------------------------------------------------
 void CEngine::SetQuitting(EngineDllQuitting_t quitDllState)
 {
-	const int index = 9;
+	const static int index = 9;
 	CallVFunc<void>(index, this, quitDllState);
 }
 */

r5dev/game/server/gameinterface.cpp

@@ -14,7 +14,7 @@
 //-----------------------------------------------------------------------------
 void CServerGameDLL::GameInit(void)
 {
-	const int index = 1;
+	const static int index = 1;
 	CallVFunc<void>(index, this);
 }
 
@@ -23,7 +23,7 @@ void CServerGameDLL::GameInit(void)
 //-----------------------------------------------------------------------------
 void CServerGameDLL::PrecompileScriptsJob(void)
 {
-	const int index = 2;
+	const static int index = 2;
 	CallVFunc<void>(index, this);
 }
 
@@ -32,7 +32,7 @@ void CServerGameDLL::PrecompileScriptsJob(void)
 //-----------------------------------------------------------------------------
 void CServerGameDLL::LevelShutdown(void)
 {
-	const int index = 8;
+	const static int index = 8;
 	CallVFunc<void>(index, this);
 }
 
@@ -42,7 +42,7 @@ void CServerGameDLL::LevelShutdown(void)
 //-----------------------------------------------------------------------------
 void CServerGameDLL::GameShutdown(void)
 {
-	const int index = 9;
+	const static int index = 9;
 	CallVFunc<void>(index, this);
 }
 
@@ -52,7 +52,7 @@ void CServerGameDLL::GameShutdown(void)
 //-----------------------------------------------------------------------------
 float CServerGameDLL::GetTickInterval(void)
 {
-	const int index = 11;
+	const static int index = 11;
 	return CallVFunc<float>(index, this);
 }
 

r5dev/inputsystem/inputsystem.cpp

@@ -13,7 +13,7 @@
 //-----------------------------------------------------------------------------
 void CInputSystem::EnableInput(bool bEnabled)
 {
-	const int index = 10;
+	const static int index = 10;
 	CallVFunc<void>(index, this, bEnabled);
 }
 
@@ -22,7 +22,7 @@ void CInputSystem::EnableInput(bool bEnabled)
 //-----------------------------------------------------------------------------
 void CInputSystem::EnableMessagePump(bool bEnabled)
 {
-	const int index = 11;
+	const static int index = 11;
 	CallVFunc<void>(index, this, bEnabled);
 }
 
@@ -31,7 +31,7 @@ void CInputSystem::EnableMessagePump(bool bEnabled)
 //-----------------------------------------------------------------------------
 bool CInputSystem::IsButtonDown(ButtonCode_t Button)
 {
-	const int index = 13;
+	const static int index = 13;
 	return CallVFunc<bool>(index, this, Button);
 }
 

r5dev/public/idebugoverlay.h

@@ -19,22 +19,22 @@ class CIVDebugOverlay : public IVDebugOverlay
 public:
 	void AddBoxOverlay(__m128i& vTransforms, const Vector3D& vMins, const Vector3D& vMaxs, int r, int g, int b, int a, bool bZBuffer, float flDuration)
 	{
-		const int index = 1;
+		const static int index = 1;
 		CallVFunc<void>(index, this, vTransforms, vMins, vMaxs, r, g, b, a, bZBuffer, flDuration);
 	}
 	void AddSphereOverlay(const Vector3D& vOrigin, float flRadius, int nTheta, int nPhi, int r, int g, int b, int a, float flDuration)
 	{
-		const int index = 3;
+		const static int index = 3;
 		CallVFunc<void>(index, this, vOrigin, flRadius, nTheta, nPhi, r, g, b, a, flDuration);
 	}
 	void AddLineOverlay(const Vector3D& vStart, const Vector3D& vEnd, int r, int g, int b, char bZBuffer, float flDuration)
 	{
-		const int index = 5;
+		const static int index = 5;
 		CallVFunc<void>(index, this, vStart, vEnd, r, g, b, bZBuffer, flDuration);
 	}
 	void AddCapsuleOverlay(const Vector3D& vStart, const Vector3D& vEnd, const Vector3D& vRadius, const Vector3D& vTop, const Vector3D& vBottom, int r, int g, int b, int a, float flDuration)
 	{
-		const int index = 12;
+		const static int index = 12;
 		CallVFunc<void>(index, this, vStart, vEnd, vRadius, vTop, vBottom, r, g, b, a, flDuration);
 	}
 };

r5dev/tier0/memstd.h

@@ -7,25 +7,25 @@ public:
 	template<typename T>
 	T* Alloc(size_t nSize)
 	{
-		const int index = 0;
+		const static int index = 0;
 		return CallVFunc<T*>(index, this, nSize);
 	}
 	template<typename T>
 	T* Realloc(T* pMem, size_t nSize)
 	{
-		const int index = 3;
+		const static int index = 3;
 		return CallVFunc<T*>(index, this, pMem, nSize);
 	}
 	template<typename T>
 	void Free(T* pMem)
 	{
-		const int index = 5;
+		const static int index = 5;
 		CallVFunc<void>(index, this, pMem);
 	}
 	template<typename T>
 	size_t GetSize(T* pMem)
 	{
-		const int index = 6;
+		const static int index = 6;
 		return CallVFunc<size_t>(index, this, pMem);
 	}
 };

r5dev/tier1/IConVar.cpp

@@ -200,9 +200,9 @@ void ConVar::Init(void) const
 	net_useRandomKey           = ConVar::Create("net_useRandomKey"          , "1"                        , FCVAR_RELEASE        , "Use random AES encryption key for game packets.", false, 0.f, false, 0.f, &NET_UseRandomKeyChanged_f, nullptr);
 	//-------------------------------------------------------------------------
 	// NETWORKSYSTEM                                                          |
-	pylon_matchmaking_hostname = ConVar::Create("pylon_matchmaking_hostname", "r5a-comp-sv.herokuapp.com", FCVAR_RELEASE        , "Holds the pylon matchmaking hostname.", false, 0.f, false, 0.f, &MP_HostName_Changed_f, nullptr);
-	pylon_host_update_interval = ConVar::Create("pylon_host_update_interval", "5"                        , FCVAR_RELEASE        , "Length of time in seconds between each status update interval to master server.", true, 5.f, false, 0.f, nullptr, nullptr);
-	pylon_showdebuginfo        = ConVar::Create("pylon_showdebuginfo"       , "0"                        , FCVAR_DEVELOPMENTONLY, "Shows debug output for pylon.", false, 0.f, false, 0.f, nullptr, nullptr);
+	pylon_matchmaking_hostname = ConVar::Create("pylon_matchmaking_hostname", "ms.r5reloaded.com", FCVAR_RELEASE        , "Holds the pylon matchmaking hostname.", false, 0.f, false, 0.f, &MP_HostName_Changed_f, nullptr);
+	pylon_host_update_interval = ConVar::Create("pylon_host_update_interval", "5"                , FCVAR_RELEASE        , "Length of time in seconds between each status update interval to master server.", true, 5.f, false, 0.f, nullptr, nullptr);
+	pylon_showdebuginfo        = ConVar::Create("pylon_showdebuginfo"       , "0"                , FCVAR_DEVELOPMENTONLY, "Shows debug output for pylon.", false, 0.f, false, 0.f, nullptr, nullptr);
 	//-------------------------------------------------------------------------
 	// RTECH API                                                              |
 	rtech_debug = ConVar::Create("rtech_debug", "0", FCVAR_DEVELOPMENTONLY, "Shows debug output for the RTech system.", false, 0.f, false, 0.f, nullptr, nullptr);

r5dev/tier1/cvar.cpp

@@ -664,7 +664,7 @@ int CCvarUtilities::CvarFindFlagsCompletionCallback(const char* partial, char co
 //-----------------------------------------------------------------------------
 ConCommandBase* CCvar::RegisterConCommand(ConCommandBase* pCommandToRemove)
 {
-	const int index = 9;
+	const static int index = 9;
 	return CallVFunc<ConCommandBase*>(index, this, pCommandToRemove);
 }
 
@@ -674,7 +674,7 @@ ConCommandBase* CCvar::RegisterConCommand(ConCommandBase* pCommandToRemove)
 //-----------------------------------------------------------------------------
 ConCommandBase* CCvar::UnregisterConCommand(ConCommandBase* pCommandToRemove)
 {
-	const int index = 10;
+	const static int index = 10;
 	return CallVFunc<ConCommandBase*>(index, this, pCommandToRemove);
 }
 
@@ -684,7 +684,7 @@ ConCommandBase* CCvar::UnregisterConCommand(ConCommandBase* pCommandToRemove)
 //-----------------------------------------------------------------------------
 ConCommandBase* CCvar::FindCommandBase(const char* pszCommandName)
 {
-	const int index = 14;
+	const static int index = 14;
 	return CallVFunc<ConCommandBase*>(index, this, pszCommandName);
 }
 
@@ -694,7 +694,7 @@ ConCommandBase* CCvar::FindCommandBase(const char* pszCommandName)
 //-----------------------------------------------------------------------------
 ConVar* CCvar::FindVar(const char* pszVarName)
 {
-	const int index = 16;
+	const static int index = 16;
 	return CallVFunc<ConVar*>(index, this, pszVarName);
 }
 
@@ -704,7 +704,7 @@ ConVar* CCvar::FindVar(const char* pszVarName)
 //-----------------------------------------------------------------------------
 ConCommand* CCvar::FindCommand(const char* pszCommandName)
 {
-	const int index = 18;
+	const static int index = 18;
 	return CallVFunc<ConCommand*>(index, this, pszCommandName);
 }
 
@@ -713,7 +713,7 @@ ConCommand* CCvar::FindCommand(const char* pszCommandName)
 //-----------------------------------------------------------------------------
 void CCvar::CallGlobalChangeCallbacks(ConVar* pConVar, const char* pOldString)
 {
-	const int index = 23;
+	const static int index = 23;
 	CallVFunc<void>(index, this, pConVar, pOldString);
 }
 
@@ -722,22 +722,22 @@ void CCvar::CallGlobalChangeCallbacks(ConVar* pConVar, const char* pOldString)
 //-----------------------------------------------------------------------------
 bool CCvar::IsMaterialThreadSetAllowed(void)
 {
-	const int index = 35;
+	const static int index = 35;
 	return CallVFunc<bool>(index, this);
 }
 void CCvar::QueueMaterialThreadSetValue(ConVar* pConVar, float flValue)
 {
-	const int index = 36;
+	const static int index = 36;
 	CallVFunc<void>(index, this, pConVar, flValue);
 }
 void CCvar::QueueMaterialThreadSetValue(ConVar* pConVar, int nValue)
 {
-	const int index = 37;
+	const static int index = 37;
 	CallVFunc<void>(index, this, pConVar, nValue);
 }
 void CCvar::QueueMaterialThreadSetValue(ConVar* pConVar, const char* pValue)
 {
-	const int index = 38;
+	const static int index = 38;
 	CallVFunc<void>(index, this, pConVar, pValue);
 }
 
@@ -746,7 +746,7 @@ void CCvar::QueueMaterialThreadSetValue(ConVar* pConVar, const char* pValue)
 //-----------------------------------------------------------------------------
 CCvar::CCVarIteratorInternal* CCvar::FactoryInternalIterator(void)
 {
-	const int index = 41;
+	const static int index = 41;
 	return CallVFunc<CCVarIteratorInternal*>(index, this);
 }
 

r5dev/vstdlib/keyvaluessystem.cpp

@@ -24,7 +24,7 @@ CKeyValuesSystem* KeyValuesSystem()
 //-----------------------------------------------------------------------------
 void CKeyValuesSystem::RegisterSizeofKeyValues(int64_t nSize)
 {
-	const int index = 0;
+	const static int index = 0;
 	CallVFunc<void>(index, this, nSize);
 }
 
@@ -35,7 +35,7 @@ void CKeyValuesSystem::RegisterSizeofKeyValues(int64_t nSize)
 //-----------------------------------------------------------------------------
 void* CKeyValuesSystem::AllocKeyValuesMemory(int64_t nSize)
 {
-	const int index = 1;
+	const static int index = 1;
 	return CallVFunc<void*>(index, this, nSize);
 }
 
@@ -45,7 +45,7 @@ void* CKeyValuesSystem::AllocKeyValuesMemory(int64_t nSize)
 //-----------------------------------------------------------------------------
 void CKeyValuesSystem::FreeKeyValuesMemory(void* pMem)
 {
-	const int index = 2;
+	const static int index = 2;
 	CallVFunc<void>(index, this, pMem);
 }
 
@@ -57,7 +57,7 @@ void CKeyValuesSystem::FreeKeyValuesMemory(void* pMem)
 //-----------------------------------------------------------------------------
 HKeySymbol CKeyValuesSystem::GetSymbolForString(const char* szName, bool bCreate)
 {
-	const int index = 3;
+	const static int index = 3;
 	return CallVFunc<HKeySymbol>(index, this, szName, bCreate);
 }
 
@@ -68,7 +68,7 @@ HKeySymbol CKeyValuesSystem::GetSymbolForString(const char* szName, bool bCreate
 //-----------------------------------------------------------------------------
 const char* CKeyValuesSystem::GetStringForSymbol(HKeySymbol symbol)
 {
-	const int index = 4;
+	const static int index = 4;
 	return CallVFunc<const char*>(index, this, symbol);
 }
 
@@ -78,7 +78,7 @@ const char* CKeyValuesSystem::GetStringForSymbol(HKeySymbol symbol)
 //-----------------------------------------------------------------------------
 void* CKeyValuesSystem::GetMemPool(void)
 {
-	const int index = 7;
+	const static int index = 7;
 	return CallVFunc<void*>(index, this);
 }
 
@@ -90,7 +90,7 @@ void* CKeyValuesSystem::GetMemPool(void)
 //-----------------------------------------------------------------------------
 void CKeyValuesSystem::SetKeyValuesExpressionSymbol(const char* szName, bool bValue)
 {
-	const int index = 8;
+	const static int index = 8;
 	CallVFunc<void>(index, this, szName, bValue);
 }
 
@@ -100,7 +100,7 @@ void CKeyValuesSystem::SetKeyValuesExpressionSymbol(const char* szName, bool bVa
 //-----------------------------------------------------------------------------
 bool CKeyValuesSystem::GetKeyValuesExpressionSymbol(const char* szName)
 {
-	const int index = 9;
+	const static int index = 9;
 	return CallVFunc<bool>(index, this, szName);
 }
 
@@ -113,6 +113,6 @@ bool CKeyValuesSystem::GetKeyValuesExpressionSymbol(const char* szName)
 //-----------------------------------------------------------------------------
 HKeySymbol CKeyValuesSystem::GetSymbolForStringCaseSensitive(HKeySymbol& hCaseInsensitiveSymbol, const char* szName, bool bCreate)
 {
-	const int index = 10;
+	const static int index = 10;
 	return CallVFunc<HKeySymbol>(index, this, hCaseInsensitiveSymbol, szName, bCreate);
 }