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

Remove troll function from HLClient.

Browse Source
This commit is contained in:
PixieCore 2022-06-23 21:08:56 +02:00
parent 2678fe2ec8
commit 1da841d4dd
3 changed files with 3 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
r5dev/client/cdll_engine_int.cpp
View File

@ -21,22 +21,6 @@
//-----------------------------------------------------------------------------
void CHLClient::FrameStageNotify(CHLClient* pHLClient, ClientFrameStage_t frameStage)
{
switch (frameStage)
{
case ClientFrameStage_t::FRAME_START: // FrameStageNotify gets called every frame by CEngine::Frame with the stage being FRAME_START. We can use this to check/set global variables.
{
break;
}
case ClientFrameStage_t::FRAME_NET_UPDATE_POSTDATAUPDATE_END:
{
gHLClient->PatchNetVarConVar();
break;
}
default:
{
break;
}
}
CHLClient_FrameStageNotify(pHLClient, frameStage);
}
@ -50,56 +34,6 @@ ClientClass* CHLClient::GetAllClasses()
return CHLClient_GetAllClasses();
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CHLClient::PatchNetVarConVar(void) const
{
#ifdef GAMEDLL_S3
static bool bASLR = true;
static bool bInit = false;
static void* pCVar = 0;
if (!bASLR && !bInit)
{
CHAR sConVarPtr[] = "\x72\x3a\x73\x76\x72\x75\x73\x7a\x7a\x03\x04";
PCHAR curr = sConVarPtr;
while (*curr)
{
*curr ^= 'B';
++curr;
}
stringstream ss;
ss << std::hex << string(sConVarPtr);
ss >> pCVar;
bInit = true;
}
else if (!bInit)
{
CMemory mCVar = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\xF3\x0F\x11\x83\x8C\x21\x00\x00"), "xxxxxxxx");
pCVar = mCVar.RCast<void*>();
bInit = true;
}
if (*reinterpret_cast<uint8_t*>(pCVar) == 144)
{
uint8_t padding[] =
{
0x48, 0x8B, 0x45,
0x58, 0xC7, 0x00,
0x00, 0x00, 0x00,
0x00
};
void* pCallback = nullptr;
VirtualAlloc(pCallback, 10, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE);
memcpy(pCallback, reinterpret_cast<void*>(padding), 9);
reinterpret_cast<void(*)()>(pCallback)();
}
#endif // GAMEDLL_S3
}
///////////////////////////////////////////////////////////////////////////////
void CHLClient_Attach()
{

1
r5dev/client/cdll_engine_int.h
View File

@ -28,7 +28,6 @@ class CHLClient
public:
static void FrameStageNotify(CHLClient* pHLClient, ClientFrameStage_t curStage);
ClientClass* GetAllClasses();
void PatchNetVarConVar(void) const;
void* /* CUserCmd* */ GetUserCmd(int sequenceNumber) // @0x1405BB020 in R5pc_r5launch_N1094_CL456479_2019_10_30_05_20_PM
{

7
r5dev/common/netmessages.h
View File

@ -35,7 +35,6 @@ private:
class SVC_UserMessage : public CNetMessage, IServerMessageHandler
{
public:
bool Process();
int m_nMsgType;
@ -77,15 +76,15 @@ class HMM_Heartbeat : public IDetour
virtual void GetFun(void) const
{
MM_Heartbeat__ToString = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x83\xEC\x38\xE8\x00\x00\x00\x00\x3B\x05\x00\x00\x00\x00"), "xxxxx????xx????");
// 0x1402312A0 // 48 83 EC 38 E8 ? ? ? ? 3B 05 ? ? ? ?
// 48 83 EC 38 E8 ? ? ? ? 3B 05 ? ? ? ?
}
virtual void GetVar(void) const
{
// We get the actual address of the vtable here, not the class instance.
g_pSVC_Print_VTable = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x74\x1E\x48\x8D\x05\x00\x00\x00\x00\x89\x5F\x08"), "xxxxx????xxx").OffsetSelf(0x2).ResolveRelativeAddressSelf(0x3, 0x7);
// 0x1402D21F6 74 1E 48 8D 05 ? ? ? ? 89 5F 08
// 74 1E 48 8D 05 ? ? ? ? 89 5F 08
g_pSVC_UserMessage_VTable = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\xE8\x00\x00\x00\x00\x48\x85\xFF\x74\x65"), "x????xxxxx").OffsetSelf(0xD).ResolveRelativeAddressSelf(0x3, 0x7);
// 0x1402D295E E8 ? ? ? ? 48 85 FF 74 65
// E8 ? ? ? ? 48 85 FF 74 65
}
virtual void GetCon(void) const { }
virtual void Attach(void) const { }