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

Confirmed working on <S3

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-05-19 21:29:40 +02:00
parent 62b062df6a
commit f14b3e5dfa
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
r5dev/rtech/rtech_game.h
View File

@ -24,14 +24,9 @@ enum class ePakStatus : int
}; };
/* ==== RTECH_GAME ====================================================================================================================================================== */ /* ==== RTECH_GAME ====================================================================================================================================================== */
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
inline CMemory p_CPakFile_LoadPak; inline CMemory p_CPakFile_LoadPak;
inline auto CPakFile_LoadPak = p_CPakFile_LoadPak.RCast<unsigned int (*)(void* thisptr, void* a2, uint64_t a3)>(); inline auto CPakFile_LoadPak = p_CPakFile_LoadPak.RCast<unsigned int (*)(void* thisptr, void* a2, uint64_t a3)>();
inline CMemory p_CPakFile_LoadMapPak;
inline auto CPakFile_LoadMapPak = p_CPakFile_LoadMapPak.RCast<bool (*)(const char* szPakFile)>();
#endif
inline CMemory p_CPakFile_AsyncLoad; inline CMemory p_CPakFile_AsyncLoad;
inline auto CPakFile_AsyncLoad = p_CPakFile_AsyncLoad.RCast<RPakHandle_t(*)(const char* szPakFileName, uintptr_t pMalloc, int nIdx, bool bUnk)>(); inline auto CPakFile_AsyncLoad = p_CPakFile_AsyncLoad.RCast<RPakHandle_t(*)(const char* szPakFileName, uintptr_t pMalloc, int nIdx, bool bUnk)>();
@ -56,22 +51,18 @@ class VRTechGame : public IDetour
virtual void GetAdr(void) const virtual void GetAdr(void) const
{ {
spdlog::debug("| FUN: CPakFile::AsyncLoad : {:#18x} |\n", p_CPakFile_AsyncLoad.GetPtr()); spdlog::debug("| FUN: CPakFile::AsyncLoad : {:#18x} |\n", p_CPakFile_AsyncLoad.GetPtr());
#if defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
spdlog::debug("| FUN: CPakFile::LoadPak : {:#18x} |\n", p_CPakFile_LoadPak.GetPtr()); spdlog::debug("| FUN: CPakFile::LoadPak : {:#18x} |\n", p_CPakFile_LoadPak.GetPtr());
spdlog::debug("| FUN: CPakFile::LoadMapPak : {:#18x} |\n", p_CPakFile_LoadMapPak.GetPtr());
spdlog::debug("| FUN: CPakFile::UnloadPak : {:#18x} |\n", p_CPakFile_UnloadPak.GetPtr()); spdlog::debug("| FUN: CPakFile::UnloadPak : {:#18x} |\n", p_CPakFile_UnloadPak.GetPtr());
#endif // GAMEDLL_S2 || GAMEDLL_S3
spdlog::debug("+----------------------------------------------------------------+\n"); spdlog::debug("+----------------------------------------------------------------+\n");
} }
virtual void GetFun(void) const virtual void GetFun(void) const
{ {
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1) #if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
p_CPakFile_LoadPak = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x4C\x24\x00\x56\x41\x55\x48\x81\xEC\x00\x00\x00\x00\x4C\x8B\x69\x60"), "xxxx?xxxxxx????xxxx");
CPakFile_LoadPak = p_CPakFile_LoadPak.RCast<unsigned int (*)(void*, void*, uint64_t)>(); /*48 89 4C 24 ? 56 41 55 48 81 EC ? ? ? ? 4C 8B 69 60*/
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3) #elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
p_CPakFile_LoadPak = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x4C\x24\x00\x56\x41\x55"), "xxxx?xxx"); /*48 89 4C 24 ? 56 41 55*/ p_CPakFile_LoadPak = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x4C\x24\x00\x56\x41\x55"), "xxxx?xxx"); /*48 89 4C 24 ? 56 41 55*/
CPakFile_LoadPak = p_CPakFile_LoadPak.RCast<unsigned int (*)(void*, void*, uint64_t)>(); CPakFile_LoadPak = p_CPakFile_LoadPak.RCast<unsigned int (*)(void*, void*, uint64_t)>();
p_CPakFile_LoadMapPak = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x81\xEC\x00\x00\x00\x00\x0F\xB6\x05\x00\x00\x00\x00\x4C\x8D\x05\x00\x00\x00\x00\x84\xC0"), "xxx????xxx????xxx????xx");
CPakFile_LoadMapPak = p_CPakFile_LoadMapPak.RCast<bool (*)(const char*)>(); /*48 81 EC ? ? ? ? 0F B6 05 ? ? ? ? 4C 8D 05 ? ? ? ? 84 C0*/
#endif #endif
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1) || defined (GAMEDLL_S2) #if defined (GAMEDLL_S0) || defined (GAMEDLL_S1) || defined (GAMEDLL_S2)
p_CPakFile_AsyncLoad = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x53\x48\x83\xEC\x40\x48\x89\x6C\x24\x00\x41\x8B\xE8"), "xxxxxxxxxx?xxx"); p_CPakFile_AsyncLoad = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x53\x48\x83\xEC\x40\x48\x89\x6C\x24\x00\x41\x8B\xE8"), "xxxxxxxxxx?xxx");

6
r5dev/vstdlib/callback.cpp
View File

@ -331,7 +331,6 @@ Pak_ListPaks_f
*/ */
void Pak_ListPaks_f(const CCommand& args) void Pak_ListPaks_f(const CCommand& args)
{ {
#ifdef GAMEDLL_S3
DevMsg(eDLL_T::RTECH, "| id | name | status | asset count |\n"); DevMsg(eDLL_T::RTECH, "| id | name | status | asset count |\n");
DevMsg(eDLL_T::RTECH, "|----|----------------------------------------------------|--------------------------------------|-------------|\n"); DevMsg(eDLL_T::RTECH, "|----|----------------------------------------------------|--------------------------------------|-------------|\n");
@ -357,7 +356,6 @@ void Pak_ListPaks_f(const CCommand& args)
DevMsg(eDLL_T::RTECH, "|----|----------------------------------------------------|--------------------------------------|-------------|\n"); DevMsg(eDLL_T::RTECH, "|----|----------------------------------------------------|--------------------------------------|-------------|\n");
DevMsg(eDLL_T::RTECH, "| %16i loaded paks. |\n", nActuallyLoaded); DevMsg(eDLL_T::RTECH, "| %16i loaded paks. |\n", nActuallyLoaded);
DevMsg(eDLL_T::RTECH, "|----|----------------------------------------------------|--------------------------------------|-------------|\n"); DevMsg(eDLL_T::RTECH, "|----|----------------------------------------------------|--------------------------------------|-------------|\n");
#endif // GAMEDLL_S3
} }
/* /*
@ -367,7 +365,6 @@ Pak_RequestUnload_f
*/ */
void Pak_RequestUnload_f(const CCommand& args) void Pak_RequestUnload_f(const CCommand& args)
{ {
#ifdef GAMEDLL_S3
if (args.ArgC() < 2) if (args.ArgC() < 2)
{ {
return; return;
@ -405,7 +402,6 @@ void Pak_RequestUnload_f(const CCommand& args)
Error(eDLL_T::RTECH, "%s - %s", __FUNCTION__, e.what()); Error(eDLL_T::RTECH, "%s - %s", __FUNCTION__, e.what());
return; return;
} }
#endif // GAMEDLL_S3
} }
/* /*
@ -426,7 +422,6 @@ Pak_Swap_f
*/ */
void Pak_Swap_f(const CCommand& args) void Pak_Swap_f(const CCommand& args)
{ {
#ifdef GAMEDLL_S3
try try
{ {
RPakHandle_t nPakId = 0; RPakHandle_t nPakId = 0;
@ -470,7 +465,6 @@ void Pak_Swap_f(const CCommand& args)
Error(eDLL_T::RTECH, "%s - %s", __FUNCTION__, e.what()); Error(eDLL_T::RTECH, "%s - %s", __FUNCTION__, e.what());
return; return;
} }
#endif// GAMEDLL_S3
} }
/* /*