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 last hardcoded addresses for GameSDK

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-04-13 01:25:33 +02:00
parent e1f5e7d46b
commit 7ba4f4021b
5 changed files with 72 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
r5dev/client/cdll_engine_int.cpp
View File

@ -1,3 +1,8 @@
//=============================================================================
//
//
//=============================================================================
#include "core/stdafx.h"
/*****************************************************************************/
#include "tier1/cvar.h"
@ -15,7 +20,7 @@
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void __fastcall HFrameStageNotify(CHLClient* rcx, ClientFrameStage_t frameStage)
void CHLClient::FrameStageNotify(CHLClient* pHLClient, ClientFrameStage_t frameStage)
{
switch (frameStage)
{
@ -69,7 +74,7 @@ void __fastcall HFrameStageNotify(CHLClient* rcx, ClientFrameStage_t frameStage)
case ClientFrameStage_t::FRAME_NET_UPDATE_POSTDATAUPDATE_END:
{
g_pBanSystem->BanListCheck();
PatchNetVarConVar();
g_pHLClient->PatchNetVarConVar();
break;
}
default:
@ -79,49 +84,66 @@ void __fastcall HFrameStageNotify(CHLClient* rcx, ClientFrameStage_t frameStage)
}
g_pIConsole->Think();
g_pRConClient->RunFrame();
CHLClient_FrameStageNotify(rcx, frameStage);
CHLClient_FrameStageNotify(pHLClient, frameStage);
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void PatchNetVarConVar()
void CHLClient::PatchNetVarConVar(void) const
{
CHAR sConvarPtr[] = "\x72\x3a\x73\x76\x72\x75\x73\x7a\x7a\x03\x04";
PCHAR curr = sConvarPtr;
while (*curr)
#ifdef GAMEDLL_S3
static bool bASLR = true;
static bool bInit = false;
static void* pCVar = 0;
if (!bASLR && !bInit)
{
*curr ^= 'B';
++curr;
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;
}
std::int64_t nCvarAddr = 0;
std::stringstream ss;
ss << std::hex << std::string(sConvarPtr);
ss >> nCvarAddr;
void* pCvar = reinterpret_cast<void*>(nCvarAddr);
if (*reinterpret_cast<std::uint8_t*>(pCvar) == 144)
if (*reinterpret_cast<uint8_t*>(pCVar) == 144)
{
std::uint8_t padding[] =
uint8_t padding[] =
{
0x48, 0x8B, 0x45, 0x58, 0xC7, 0x00, 0x00, 0x00, 0x00, 0x00
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, (void*)padding, 9);
memcpy(pCallback, reinterpret_cast<void*>(padding), 9);
reinterpret_cast<void(*)()>(pCallback)();
}
#endif // GAMEDLL_S3
}
///////////////////////////////////////////////////////////////////////////////
void CHLClient_Attach()
{
DetourAttach((LPVOID*)&CHLClient_FrameStageNotify, &HFrameStageNotify);
DetourAttach((LPVOID*)&CHLClient_FrameStageNotify, &CHLClient::FrameStageNotify);
}
void CHLClient_Detach()
{
DetourDetach((LPVOID*)&CHLClient_FrameStageNotify, &HFrameStageNotify);
DetourDetach((LPVOID*)&CHLClient_FrameStageNotify, &CHLClient::FrameStageNotify);
}

14
r5dev/client/cdll_engine_int.h
View File

@ -25,11 +25,8 @@ enum class ClientFrameStage_t : int
class CHLClient
{
public:
void FrameStageNotify(ClientFrameStage_t curStage) // @0x1405C0740 in R5pc_r5launch_N1094_CL456479_2019_10_30_05_20_PM
{
static int index = 58;
CallVFunc<void>(index, this, curStage); /*48 83 EC 28 89 15 ?? ?? ?? ??*/
}
static void FrameStageNotify(CHLClient* pHLClient, ClientFrameStage_t curStage);
void PatchNetVarConVar(void) const;
void* /* CUserCmd* */ GetUserCmd(int sequenceNumber) // @0x1405BB020 in R5pc_r5launch_N1094_CL456479_2019_10_30_05_20_PM
{
@ -62,12 +59,12 @@ inline auto CHLClient_FrameStageNotify = p_CHLClient_FrameStageNotify.RCast<void
inline CMemory p_CHLClient_HudProcessInput = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x83\xEC\x28\x0F\xB6\x0D\x00\x00\x00\x00\x88\x15\x00\x00\x00\x00"), "xxxxxxx????xx????");
inline auto CHLClient_HudProcessInput = p_CHLClient_HudProcessInput.RCast<void(*)(void* thisptr, bool bActive)>(); /*48 83 EC 28 0F B6 0D ? ? ? ? 88 15 ? ? ? ?*/
inline CHLClient* g_pHLClient = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>
("\x48\x8D\x05\x00\x00\x00\x00\xC3\xCC\xCC\xCC\xCC\xCC\xCC\xCC\xCC\x48\x89\x5C\x24\x00\x57\x48\x83\xEC\x30\x48\x8B\xF9"),
"xxx????xxxxxxxxxxxxx?xxxxxxxx").ResolveRelativeAddressSelf(0x3, 0x7).RCast<CHLClient*>();
inline bool* cl_time_use_host_tickcount = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x80\x3D\x00\x00\x00\x00\x00\x74\x14\x66\x0F\x6E\x05\x00\x00\x00\x00"), "xx?????xxxxxx????").ResolveRelativeAddress(0x2, 0x7).RCast<bool*>();
///////////////////////////////////////////////////////////////////////////////
void __fastcall HFrameStageNotify(CHLClient* rcx, ClientFrameStage_t frameStage);
void PatchNetVarConVar();
void CHLClient_Attach();
void CHLClient_Detach();
@ -81,6 +78,7 @@ class HDll_Engine_Int : public IDetour
std::cout << "| FUN: CHLClient::HudProcessInput : 0x" << std::hex << std::uppercase << p_CHLClient_HudProcessInput.GetPtr() << std::setw(nPad) << " |" << std::endl;
std::cout << "| FUN: CHLClient::FrameStageNotify : 0x" << std::hex << std::uppercase << p_CHLClient_FrameStageNotify.GetPtr() << std::setw(nPad) << " |" << std::endl;
std::cout << "| VAR: cl_time_use_host_tickcount : 0x" << std::hex << std::uppercase << cl_time_use_host_tickcount << std::setw(0) << " |" << std::endl;
std::cout << "| VAR: g_pHLClient : 0x" << std::hex << std::uppercase << g_pHLClient << std::setw(0) << " |" << std::endl;
std::cout << "+----------------------------------------------------------------+" << std::endl;
}
virtual void GetFun(void) const { }

1
r5dev/common/sdkdefs.h
View File

@ -9,6 +9,7 @@ using std::vector;
using std::fstream;
using std::ifstream;
using std::ofstream;
using std::stringstream;
using std::ostringstream;
namespace fs = std::filesystem;

30
r5dev/game/server/ai_networkmanager.h
View File

@ -41,17 +41,14 @@ inline CMemory p_CAI_NetworkBuilder__Build = g_mGameDll.FindPatternSIMD(reinterp
inline auto CAI_NetworkBuilder__Build = p_CAI_NetworkBuilder__Build.RCast<void* (*)(void* thisptr, CAI_Network* pNetwork, void* a3, int a4)>(); /*48 89 54 24 ? 48 89 4C 24 ? 53 55 56 57 41 54 41 55 41 56 41 57 48 83 EC 38 8B B2 ? ? ? ?*/
#endif
inline int * g_nAiNodeClusters = nullptr;
inline AINodeClusters *** g_pppAiNodeClusters = nullptr;
inline int * g_nAiNodeClusterLinks = nullptr;
inline AINodeClusterLinks*** g_pppAiNodeClusterLinks = nullptr;
void CAI_NetworkManager_Attach();
void CAI_NetworkManager_Detach();
namespace // !TODO: [AMOS] don't hardocde.
{
int* g_nAiNodeClusters = CMemory(0x165DAD808).RCast<int*>();
AINodeClusters*** g_pppAiNodeClusters = CMemory(0x165DAD7F0).RCast<AINodeClusters***>();
int* g_nAiNodeClusterLinks = CMemory(0x165DB18E8).RCast<int*>();
AINodeClusterLinks*** g_pppAiNodeClusterLinks = CMemory(0x165DB18D0).RCast<AINodeClusterLinks***>();
}
//-----------------------------------------------------------------------------
// CAI_NetworkBuilder
//
@ -65,6 +62,7 @@ public:
static void SaveNetworkGraph(CAI_Network* pNetwork);
};
///////////////////////////////////////////////////////////////////////////////
class HCAI_NetworkManager : public IDetour
{
@ -73,10 +71,24 @@ class HCAI_NetworkManager : public IDetour
std::cout << "| FUN: CAI_NetworkManager::LoadNetworkGraph : 0x" << std::hex << std::uppercase << p_CAI_NetworkManager__ShouldRebuild.GetPtr() << std::setw(nPad) << " |" << std::endl;
std::cout << "| FUN: CAI_NetworkManager::ShouldRebuild : 0x" << std::hex << std::uppercase << p_CAI_NetworkManager__ShouldRebuild.GetPtr() << std::setw(nPad) << " |" << std::endl;
std::cout << "| FUN: CAI_NetworkBuilder::Build : 0x" << std::hex << std::uppercase << p_CAI_NetworkBuilder__Build.GetPtr() << std::setw(nPad) << " |" << std::endl;
std::cout << "| VAR: g_nAiNodeClusters : 0x" << std::hex << std::uppercase << g_nAiNodeClusters << std::setw(0) << " |" << std::endl;
std::cout << "| VAR: g_pppAiNodeClusters : 0x" << std::hex << std::uppercase << g_pppAiNodeClusters << std::setw(0) << " |" << std::endl;
std::cout << "| VAR: g_nAiNodeClusterLinks : 0x" << std::hex << std::uppercase << g_nAiNodeClusterLinks << std::setw(0) << " |" << std::endl;
std::cout << "| VAR: g_pppAiNodeClusterLinks : 0x" << std::hex << std::uppercase << g_pppAiNodeClusterLinks << std::setw(0) << " |" << std::endl;
std::cout << "+----------------------------------------------------------------+" << std::endl;
}
virtual void GetFun(void) const { }
virtual void GetVar(void) const { }
virtual void GetVar(void) const
{
g_nAiNodeClusters = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x4C\x0F\xBF\x12"), "xxxx")
.FindPatternSelf("83 3D", CMemory::Direction::DOWN).ResolveRelativeAddressSelf(0x2, 0x7).RCast<int*>();
g_pppAiNodeClusters = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\xF3\x0F\x10\x52\x00\x4C\x8B\xCA"), "xxxx?xxx")
.FindPatternSelf("48 8B 35", CMemory::Direction::DOWN).ResolveRelativeAddressSelf(0x3, 0x7).RCast<AINodeClusters***>();
g_nAiNodeClusterLinks = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x49\xFF\xC0\x48\x83\xC2\x04\x4D\x3B\xC2\x7C\xD4"), "xxxxxxxxxxxx")
.FindPatternSelf("8B 3D", CMemory::Direction::DOWN).ResolveRelativeAddressSelf(0x2, 0x6).RCast<int*>();
g_pppAiNodeClusterLinks = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\xF3\x0F\x10\x52\x00\x4C\x8B\xCA"), "xxxx?xxx")
.FindPatternSelf("4C 8B 1D", CMemory::Direction::DOWN).ResolveRelativeAddressSelf(0x3, 0x7).RCast<AINodeClusterLinks***>();
}
virtual void GetCon(void) const { }
virtual void Attach(void) const { }
virtual void Detach(void) const { }

2
r5dev/rtech/stryder/stryder.h
View File

@ -12,7 +12,7 @@ inline CMemory p_Stryder_StitchRequest = g_mGameDll.FindPatternSIMD(reinterpret_
inline auto Stryder_StitchRequest = p_Stryder_StitchRequest.RCast<void*(*)(void* a1)>(); /*48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 48 83 EC 20 48 8B F9 E8 B4*/
inline CMemory p_Stryder_SendOfflineRequest = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x48\x89\x74\x24\x00\x55\x57\x41\x56\x48\x8D\xAC\x24\x00\x00\x00\x00\x48\x81\xEC\x00\x00\x00\x00\x48\x8B\x35\x00\x00\x00\x00"), "xxxx?xxxx?xxxxxxxx????xxx????xxx????");
inline auto Stryder_SendOfflineRequest = p_Stryder_StitchRequest.RCast<bool(*)(void)>(); /*48 89 5C 24 ? 48 89 74 24 ? 55 57 41 56 48 8D AC 24 ? ? ? ? 48 81 EC ? ? ? ? 48 8B 35 ? ? ? ?*/
inline auto Stryder_SendOfflineRequest = p_Stryder_SendOfflineRequest.RCast<bool(*)(void)>(); /*48 89 5C 24 ? 48 89 74 24 ? 55 57 41 56 48 8D AC 24 ? ? ? ? 48 81 EC ? ? ? ? 48 8B 35 ? ? ? ?*/
#endif
///////////////////////////////////////////////////////////////////////////////