R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Code improvements

Browse Source 
* Use GetVirtualMethodTable for VFTable pointers.
* Pack CClientState to 4 bytes (this aligns it properly in memory).
* Use CClientState members directly for setting m_bRestrictServerCommands/m_bRestrictClientCommands.
This commit is contained in:
Kawe Mazidjatari 2022-08-15 22:29:16 +02:00
parent 2d367f56fe
commit 8bf6dac3d8
10 changed files with 53 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
r5dev/client/vengineclient_impl.cpp
View File

@ -6,11 +6,7 @@
#include "core/stdafx.h"
#include "client/vengineclient_impl.h"
//#ifdef GAMEDLL_S3
bool* m_bRestrictServerCommands = nullptr;
bool* m_bRestrictClientCommands = nullptr;
//#endif
#include "engine/client/clientstate.h"
//---------------------------------------------------------------------------------
// Purpose: define if commands from the server should be restricted or not.
@ -19,7 +15,7 @@ bool* m_bRestrictClientCommands = nullptr;
//---------------------------------------------------------------------------------
void CEngineClient::SetRestrictServerCommands(bool bRestricted)
{
*m_bRestrictServerCommands = bRestricted;
g_pClientState->m_bRestrictServerCommands = bRestricted;
}
//---------------------------------------------------------------------------------
@ -29,7 +25,7 @@ void CEngineClient::SetRestrictServerCommands(bool bRestricted)
//---------------------------------------------------------------------------------
bool CEngineClient::GetRestrictServerCommands() const
{
return *m_bRestrictServerCommands;
return g_pClientState->m_bRestrictServerCommands;
}
//---------------------------------------------------------------------------------
@ -39,7 +35,7 @@ bool CEngineClient::GetRestrictServerCommands() const
//---------------------------------------------------------------------------------
void CEngineClient::SetRestrictClientCommands(bool bRestricted)
{
*m_bRestrictClientCommands = bRestricted;
g_pClientState->m_bRestrictClientCommands = bRestricted;
}
//---------------------------------------------------------------------------------
@ -49,7 +45,7 @@ void CEngineClient::SetRestrictClientCommands(bool bRestricted)
//---------------------------------------------------------------------------------
bool CEngineClient::GetRestrictClientCommands() const
{
return *m_bRestrictClientCommands;
return g_pClientState->m_bRestrictClientCommands;
}
//---------------------------------------------------------------------------------

30
r5dev/client/vengineclient_impl.h
View File

@ -18,11 +18,8 @@ inline CMemory p_CEngineClient_GetLocalPlayer;
inline auto CEngineClient_GetLocalPlayer = p_CEngineClient_GetLocalPlayer.RCast<void*(*)()>();
///////////////////////////////////////////////////////////////////////////////
inline CEngineClient** g_ppEngineClient = nullptr;
inline CMemory g_pEngineClient_VTable = nullptr;
extern bool* m_bRestrictServerCommands;
extern bool* m_bRestrictClientCommands;
inline CMemory g_pEngineClientVFTable = nullptr;
inline CEngineClient* g_pEngineClient = nullptr;
///////////////////////////////////////////////////////////////////////////////
class HVEngineClient : public IDetour
@ -31,10 +28,7 @@ class HVEngineClient : public IDetour
{
spdlog::debug("| FUN: IVEngineClient::CommandExecute : {:#18x} |\n", p_CEngineClient_CommandExecute.GetPtr());
spdlog::debug("| FUN: IVEngineClient::GetLocalPlayer : {:#18x} |\n", p_CEngineClient_GetLocalPlayer.GetPtr());
spdlog::debug("| VAR: m_bRestrictServerCommands : {:#18x} |\n", reinterpret_cast<uintptr_t>(m_bRestrictServerCommands));
spdlog::debug("| VAR: m_bRestrictClientCommands : {:#18x} |\n", reinterpret_cast<uintptr_t>(m_bRestrictClientCommands));
spdlog::debug("| CON: g_ppEngineClient : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_ppEngineClient));
spdlog::debug("| CON: g_pEngineClient_VTable : {:#18x} |\n", g_pEngineClient_VTable.GetPtr());
spdlog::debug("| CON: g_pEngineClientVFTable : {:#18x} |\n", g_pEngineClientVFTable.GetPtr());
spdlog::debug("+----------------------------------------------------------------+\n");
}
virtual void GetFun(void) const
@ -45,24 +39,14 @@ class HVEngineClient : public IDetour
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
p_CEngineClient_GetLocalPlayer = g_pEngineClient_VTable.WalkVTable(35).Deref().RCast<void*(*)()>();
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
p_CEngineClient_GetLocalPlayer = g_pEngineClient_VTable.WalkVTable(36).Deref().RCast<void*(*)()>();
p_CEngineClient_GetLocalPlayer = g_pEngineClientVFTable.WalkVTable(36).Deref().RCast<void*(*)()>();
#endif
}
virtual void GetVar(void) const
{
CMemory clRestrict = g_GameDll.FindString("DevShotGenerator_Init()").FindPatternSelf("88 05", CMemory::Direction::UP).ResolveRelativeAddressSelf(0x2).OffsetSelf(0x2);
m_bRestrictServerCommands = clRestrict.RCast<bool*>();
m_bRestrictClientCommands = clRestrict.Offset(0x1).RCast<bool*>();
}
virtual void GetVar(void) const { }
virtual void GetCon(void) const
{
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
g_pEngineClient_VTable = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x8D\x05\x00\x00\x00\x00\x48\x8B\xD9\x48\x89\x01\xF6\xC2\x01\x74\x0A\xBA\x00\x00\x00\x00\xE8\x00\x00\x00\x00\x48\x8B\xC3\x48\x83\xC4\x20\x5B\xC3\xCC\xCC\xCC\xCC\xCC\x48\x85\xC9\x48\x8D\x41\xF8"),
"xxx????xxxxxxxxxxxx????x????xxxxxxxxxxxxxxxxxxxxx").ResolveRelativeAddressSelf(0x3, 0x7); /*48 8D 05 ? ? ? ? 48 8B D9 48 89 01 F6 C2 01 74 0A BA ? ? ? ? E8 ? ? ? ? 48 8B C3 48 83 C4 20 5B C3 CC CC CC CC CC 48 85 C9 48 8D 41 F8*/
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
g_pEngineClient_VTable = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x8B\x05\x00\x00\x00\x00\xFF\x90\x00\x00\x00\x00\x4C\x8D\x05\x00\x00\x00\x00"), "xxx????xx????xxx????").ResolveRelativeAddressSelf(0x3, 0x7).Deref(); /*48 8B 05 ? ? ? ? FF 90 ? ? ? ? 4C 8D 05 ? ? ? ? */
#endif
g_ppEngineClient = g_GameDll.FindString("reload_script_callbacks_server").FindPatternSelf("48 8B", CMemory::Direction::UP).ResolveRelativeAddressSelf(0x3, 0x7).RCast<CEngineClient**>();
g_pEngineClientVFTable = g_GameDll.GetVirtualMethodTable(".?AVCEngineClient@@");
g_pEngineClient = g_pEngineClientVFTable.RCast<CEngineClient*>();
}
virtual void Attach(void) const { }
virtual void Detach(void) const { }

3
r5dev/engine/client/clientstate.h
View File

@ -19,7 +19,7 @@ public:
void* m_Frames;
CUtlMemoryPool m_ClientFramePool;
};
#pragma pack(push, 4)
///////////////////////////////////////////////////////////////////////////////
class CClientState : CS_INetChannelHandler, IConnectionlessPacketHandler, IServerMessageHandler, CClientSnapshotManager
{
@ -172,6 +172,7 @@ public:
char byte34A38;
char field_34A39[7];
};
#pragma pack(pop)
#ifndef DEDICATED
extern CClientState* g_pClientState;
#endif // DEDICATED

23
r5dev/engine/sys_dll2.cpp
View File

@ -8,6 +8,7 @@
#include "core/stdafx.h"
#include "tier1/cmd.h"
#include "tier1/cvar.h"
#include "tier1/strtools.h"
#include "engine/sys_dll.h"
#include "engine/sys_dll2.h"
#include "client/vengineclient_impl.h"
@ -17,12 +18,12 @@
//-----------------------------------------------------------------------------
static bool IsValveMod(const char* pModName)
{
return (_stricmp(pModName, "cstrike") == 0 ||
_stricmp(pModName, "dod") == 0 ||
_stricmp(pModName, "hl1mp") == 0 ||
_stricmp(pModName, "tf") == 0 ||
_stricmp(pModName, "hl2mp") == 0 ||
_stricmp(pModName, "csgo") == 0);
return (Q_stricmp(pModName, "cstrike") == 0 ||
Q_stricmp(pModName, "dod") == 0 ||
Q_stricmp(pModName, "hl1mp") == 0 ||
Q_stricmp(pModName, "tf") == 0 ||
Q_stricmp(pModName, "hl2mp") == 0 ||
Q_stricmp(pModName, "csgo") == 0);
}
//-----------------------------------------------------------------------------
@ -30,10 +31,10 @@ static bool IsValveMod(const char* pModName)
//-----------------------------------------------------------------------------
static bool IsRespawnMod(const char* pModName)
{
return (_stricmp(pModName, "platform") == 0 ||
_stricmp(pModName, "r1") == 0 ||
_stricmp(pModName, "r2") == 0 ||
_stricmp(pModName, "r5") == 0);
return (Q_stricmp(pModName, "platform") == 0 ||
Q_stricmp(pModName, "r1") == 0 ||
Q_stricmp(pModName, "r2") == 0 ||
Q_stricmp(pModName, "r5") == 0);
}
//-----------------------------------------------------------------------------
@ -49,7 +50,7 @@ bool CEngineAPI::ModInit(CEngineAPI* pEngineAPI, const char* pModName, const cha
bool results = CEngineAPI_ModInit(pEngineAPI, pModName, pGameDir);
if (!IsValveMod(pModName) && IsRespawnMod(pModName))
{
(*g_ppEngineClient)->SetRestrictServerCommands(true); // Restrict commands.
g_pEngineClient->SetRestrictServerCommands(true); // Restrict commands.
ConCommandBase* disconnect = g_pCVar->FindCommandBase("disconnect");
disconnect->AddFlags(FCVAR_SERVER_CAN_EXECUTE); // Make sure server is not restricted to this.

6
r5dev/materialsystem/cmaterialglue.h
View File

@ -47,7 +47,7 @@ public:
static_assert(sizeof(CMaterialGlue) == 0x130);
#pragma pack(pop)
inline void* g_pMaterialGlueVTable = nullptr;
inline void* g_pMaterialGlueVFTable = nullptr;
/* ==== CMATERIALGLUE ================================================================================================================================================== */
inline CMemory p_GetMaterialAtCrossHair;
@ -61,7 +61,7 @@ class VMaterialGlue : public IDetour
virtual void GetAdr(void) const
{
spdlog::debug("| FUN: CMaterialGlue::GetMaterialAtCrossHair: {:#18x} |\n", p_GetMaterialAtCrossHair.GetPtr());
spdlog::debug("| CON: g_pMaterialGlueVTable : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pMaterialGlueVTable));
spdlog::debug("| CON: g_pMaterialGlueVFTable : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pMaterialGlueVFTable));
spdlog::debug("+----------------------------------------------------------------+\n");
}
virtual void GetFun(void) const
@ -72,7 +72,7 @@ class VMaterialGlue : public IDetour
virtual void GetVar(void) const { }
virtual void GetCon(void) const
{
g_pMaterialGlueVTable = g_GameDll.GetVirtualMethodTable(".?AVCMaterialGlue@@");
g_pMaterialGlueVFTable = g_GameDll.GetVirtualMethodTable(".?AVCMaterialGlue@@");
}
virtual void Attach(void) const { }
virtual void Detach(void) const { }

19
r5dev/materialsystem/cshaderglue.h
View File

@ -34,24 +34,29 @@ static_assert(sizeof(CShaderGlue) == 0x40); // [ PIXIE ]: All vars have proper d
inline auto CShaderGlue_SetupShader = CMemory().RCast<int(*)(CShaderGlue* thisptr, uint64_t nCount, uint64_t a3, void* pRawMaterialGlueWithoutVTable)>();
inline CMemory CShaderGlue_VTable;
inline void* g_pCShaderGlue_VTable = nullptr;
inline void* g_pShaderGlueVFTable = nullptr;
void CShaderGlue_Attach();
void CShaderGlue_Detach();
///////////////////////////////////////////////////////////////////////////////
class VShaderGlue : public IDetour
{
virtual void GetAdr(void) const { }
virtual void GetAdr(void) const
{
spdlog::debug("| FUN: CShaderGlue::SetupShader : {:#18x} |\n", reinterpret_cast<uintptr_t>(CShaderGlue_SetupShader));
spdlog::debug("| CON: g_pShaderGlueVFTable : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pShaderGlueVFTable));
spdlog::debug("+----------------------------------------------------------------+\n");
}
virtual void GetFun(void) const
{
// We get it here in GetFun because we grab other functions with it, it's more efficient.
CShaderGlue_VTable = g_GameDll.GetVirtualMethodTable(".?AVCShaderGlue@@");
g_pCShaderGlue_VTable = CShaderGlue_VTable.RCast<void*>();
CShaderGlue_SetupShader = CShaderGlue_VTable.WalkVTable(4).RCast<int(*)(CShaderGlue*, uint64_t, uint64_t, void*)>();
}
virtual void GetVar(void) const { }
virtual void GetCon(void) const { }
virtual void GetCon(void) const
{
CShaderGlue_VTable = g_GameDll.GetVirtualMethodTable(".?AVCShaderGlue@@");
g_pShaderGlueVFTable = CShaderGlue_VTable.RCast<void*>();
}
virtual void Attach(void) const { }
virtual void Detach(void) const { }
};

4
r5dev/rtech/rtech_utils.cpp
View File

@ -607,8 +607,8 @@ void RTech::CreateDXTexture(RTechTextureInfo_t* textureHeader, int64_t imageData
//----------------------------------------------------------------------------------
void** RTech::LoadShaderSet(void** VTablePtr)
{
*VTablePtr = &g_pCShaderGlue_VTable;
return &g_pCShaderGlue_VTable;
*VTablePtr = &g_pShaderGlueVFTable;
return &g_pShaderGlueVFTable;
}
#endif

12
r5dev/tier1/IConVar.h
View File

@ -122,8 +122,8 @@ class VConVar : public IDetour
spdlog::debug("| FUN: ConVar::IsFlagSet : {:#18x} |\n", p_IConVar_IsFlagSet.GetPtr());
spdlog::debug("| FUN: ConVar::SetInfo : {:#18x} |\n", p_ConVar_SetInfo.GetPtr());
spdlog::debug("| FUN: ConVar::Register : {:#18x} |\n", p_ConVar_Register.GetPtr());
spdlog::debug("| VAR: g_pConVarVtable : {:#18x} |\n", g_pConVarVFTable.GetPtr());
spdlog::debug("| VAR: g_pIConVarVtable : {:#18x} |\n", g_pIConVarVFTable.GetPtr());
spdlog::debug("| VAR: g_pConVarVFTable : {:#18x} |\n", g_pConVarVFTable.GetPtr());
spdlog::debug("| VAR: g_pIConVarVFTable : {:#18x} |\n", g_pIConVarVFTable.GetPtr());
spdlog::debug("+----------------------------------------------------------------+\n");
}
virtual void GetFun(void) const
@ -139,12 +139,12 @@ class VConVar : public IDetour
ConVar_SetInfo = p_ConVar_SetInfo.RCast<void* (*)(ConVar*, int, int, int, void*)>(); /*40 53 48 83 EC 60 48 8B D9 C6 41 10 00 33 C9 48 8D 05 ? ? ? ? 48 89 4C 24 ? 0F 57 C0 48 89 4C 24 ? 48 89 03 48 8D 05 ? ? ? ? 48 89 43 40*/
ConVar_Register = p_ConVar_Register.RCast<void* (*)(ConVar*, const char*, const char*, int, const char*, bool, float, bool, float, FnChangeCallback_t, const char*)>(); /*48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 57 48 83 EC 40 F3 0F 10 84 24 ? ? ? ?*/
}
virtual void GetVar(void) const
virtual void GetVar(void) const { }
virtual void GetCon(void) const
{
g_pConVarVFTable = p_ConVar_SetInfo.Offset(0x00).FindPatternSelf("48 8D 05", CMemory::Direction::DOWN, 100).ResolveRelativeAddressSelf(0x3, 0x7).GetPtr(); // Get vtable ptr for ConVar table.
g_pIConVarVFTable = p_ConVar_SetInfo.Offset(0x16).FindPatternSelf("48 8D 05", CMemory::Direction::DOWN, 100).ResolveRelativeAddressSelf(0x3, 0x7).GetPtr(); // Get vtable ptr for ICvar table.
g_pConVarVFTable = g_GameDll.GetVirtualMethodTable(".?AVConVar@@", 0);
g_pIConVarVFTable = g_GameDll.GetVirtualMethodTable(".?AVConVar@@", 1);
}
virtual void GetCon(void) const { }
virtual void Attach(void) const { }
virtual void Detach(void) const { }
};

2
r5dev/tier1/cmd.cpp
View File

@ -277,7 +277,7 @@ ConCommand* ConCommand::Create(const char* pszName, const char* pszHelpString, i
ConCommand* pCommand = MemAllocSingleton()->Alloc<ConCommand>(sizeof(ConCommand));
memset(pCommand, '\0', sizeof(ConCommand));
pCommand->m_pConCommandBaseVFTable = g_pConCommandVtable.RCast<IConCommandBase*>();
pCommand->m_pConCommandBaseVFTable = g_pConCommandVFTable.RCast<IConCommandBase*>();
pCommand->m_pszName = pszName;
pCommand->m_pszHelpString = pszHelpString;
pCommand->m_nFlags = nFlags;

8
r5dev/tier1/cmd.h
View File

@ -174,7 +174,7 @@ inline auto NullSub = p_NullSub.RCast<void(*)(void)>();
inline CMemory p_CallbackStub;
inline FnCommandCompletionCallback CallbackStub = p_CallbackStub.RCast<FnCommandCompletionCallback>();
inline CMemory g_pConCommandVtable;
inline CMemory g_pConCommandVFTable;
///////////////////////////////////////////////////////////////////////////////
ECommandTarget_t Cbuf_GetCurrentPlayer(void);
@ -197,7 +197,7 @@ class VConCommand : public IDetour
spdlog::debug("| FUN: CallbackStub : {:#18x} |\n", p_CallbackStub.GetPtr());
spdlog::debug("| FUN: NullSub : {:#18x} |\n", p_NullSub.GetPtr());
spdlog::debug("+----------------------------------------------------------------+\n");
spdlog::debug("| VAR: g_pConCommandVtable : {:#18x} |\n", g_pConCommandVtable.GetPtr());
spdlog::debug("| VAR: g_pConCommandVFTable : {:#18x} |\n", g_pConCommandVFTable.GetPtr());
spdlog::debug("+----------------------------------------------------------------+\n");
}
virtual void GetFun(void) const
@ -216,9 +216,7 @@ class VConCommand : public IDetour
}
virtual void GetVar(void) const
{
g_pConCommandVtable = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>(
"\x48\x89\x5C\x24\x00\x48\x89\x74\x24\x00\x48\x89\x7C\x24\x00\x55\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8B\xEC\x48\x83\xEC\x50\x48\x8B\x15\x00\x00\x00\x00"),
"xxxx?xxxx?xxxx?xxxxxxxxxxxxxxxxxxx????").FindPatternSelf("4C 8D 25", CMemory::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x3, 0x7);
g_pConCommandVFTable = g_GameDll.GetVirtualMethodTable(".?AVConCommand@@");
}
virtual void GetCon(void) const { }
virtual void Attach(void) const { }