mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
Additional code improvements
* Removed some unused signatures. * Named 2 CBaseFileSystem methods, and applied them to 'MOD_ProcessPakQueue()'. * Renamed 'qword_1671061C8' to 'g_pMTVFTaskItem'. * Renamed 'g_pMapVPKCache' to 'g_szMTVFItemName'. * Only set first byte to 0 in 'g_szMTVFItemName' (actual size is 0x100, not 0x40).
This commit is contained in:
Kawe Mazidjatari
parent
8bf6dac3d8
commit
3c3da82154
@ -137,8 +137,8 @@ void Systems_Init()
|
||||
|
||||
initTimer.Start();
|
||||
|
||||
WS_Init(); // Initialize WinSock.
|
||||
MathLib_Init(); // Initialize MathLib.
|
||||
WS_Init(); // Initialize Winsock.
|
||||
MathLib_Init(); // Initialize Mathlib.
|
||||
|
||||
// Begin the detour transaction to hook the the process
|
||||
DetourTransactionBegin();
|
||||
@ -259,7 +259,7 @@ void Systems_Shutdown()
|
||||
CFastTimer shutdownTimer;
|
||||
shutdownTimer.Start();
|
||||
|
||||
// Shutdown WinSock system.
|
||||
// Shutdown Winsock system.
|
||||
WS_Shutdown();
|
||||
|
||||
// Begin the detour transaction to unhook the the process
|
||||
@ -375,7 +375,7 @@ void WS_Shutdown()
|
||||
int nError = ::WSACleanup();
|
||||
if (nError != 0)
|
||||
{
|
||||
std::cerr << "Failed to stop winsock via WSACleanup: (" << NET_ErrorString(WSAGetLastError()) << ")" << std::endl;
|
||||
std::cerr << "Failed to stop Winsock via WSACleanup: (" << NET_ErrorString(WSAGetLastError()) << ")" << std::endl;
|
||||
}
|
||||
}
|
||||
void QuerySystemInfo()
|
||||
@ -424,11 +424,24 @@ void QuerySystemInfo()
|
||||
|
||||
void DetourInit() // Run the sigscan
|
||||
{
|
||||
bool bLogAdr = (strstr(GetCommandLineA(), "-sig_toconsole") != nullptr);
|
||||
bool bInitDivider = false;
|
||||
|
||||
for (const IDetour* pDetour : vDetour)
|
||||
{
|
||||
pDetour->GetCon(); // Constants.
|
||||
pDetour->GetFun(); // Functions.
|
||||
pDetour->GetVar(); // Variables.
|
||||
|
||||
if (bLogAdr)
|
||||
{
|
||||
if (!bInitDivider)
|
||||
{
|
||||
bInitDivider = true;
|
||||
spdlog::debug("+----------------------------------------------------------------+\n");
|
||||
}
|
||||
pDetour->GetAdr();
|
||||
}
|
||||
}
|
||||
}
|
||||
void DetourAddress() // Test the sigscan results
|
||||
|
||||
@ -181,9 +181,6 @@ extern CClientState* g_pClientState;
|
||||
inline CMemory p_CClientState__RunFrame;
|
||||
inline auto CClientState__RunFrame = p_CClientState__RunFrame.RCast<void(*)(CClientState* thisptr)>();
|
||||
|
||||
inline CMemory p_CClientState__CheckForResend; /*48 89 5C 24 ?? 56 57 41 57 ?? 81 EC 20 04 ?? 00 45 0F B6 F9 ?? ?? ?? ?? 8B F1 48*/
|
||||
inline auto CClientState__CheckForResend = p_CClientState__CheckForResend.RCast<void(*)(CClientState* thisptr, const char* a2, std::int64_t a3, char a4, int a5, std::uint8_t* a6)>();
|
||||
|
||||
inline CMemory p_CClientState__Disconnect; /*48 89 5C 24 ?? 55 57 41 56 48 83 EC 30 0F B6 EA*/
|
||||
inline auto CClientState__Disconnect = p_CClientState__Disconnect.RCast<void(*)(CClientState* thisptr, bool bSendTrackingContext)>();
|
||||
|
||||
@ -195,7 +192,6 @@ class VClientState : public IDetour
|
||||
{
|
||||
spdlog::debug("| FUN: CClientState::RunFrame : {:#18x} |\n", p_CClientState__RunFrame.GetPtr());
|
||||
spdlog::debug("| FUN: CClientState::Disconnect : {:#18x} |\n", p_CClientState__Disconnect.GetPtr());
|
||||
spdlog::debug("| FUN: CClientState::CheckForResend : {:#18x} |\n", p_CClientState__CheckForResend.GetPtr());
|
||||
#ifndef DEDICATED
|
||||
spdlog::debug("| VAR: g_pClientState : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pClientState));
|
||||
#endif // DEDICATED
|
||||
@ -207,9 +203,6 @@ class VClientState : public IDetour
|
||||
p_CClientState__RunFrame = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x4C\x24\x00\x57\x48\x81\xEC\x00\x00\x00\x00\x83\xB9\x00\x00\x00\x00\x00"), "xxxx?xxxx????xx?????");
|
||||
CClientState__RunFrame = p_CClientState__RunFrame.RCast<void(*)(CClientState* thisptr)>();
|
||||
|
||||
p_CClientState__CheckForResend = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x56\x57\x41\x57\x00\x81\xEC\x20\x04\x00\x00\x45\x0F\xB6\xF9\x00\x00\x00\x00\x8B\xF1\x48"), "xxxx?xxxx?xxxx?xxxxx????xxx");
|
||||
CClientState__CheckForResend = p_CClientState__CheckForResend.RCast<void(*)(CClientState* thisptr, const char* a2, std::int64_t a3, char a4, int a5, std::uint8_t* a6)>(); /*48 89 5C 24 ?? 56 57 41 57 ?? 81 EC 20 04 ?? 00 45 0F B6 F9 ?? ?? ?? ?? 8B F1 48*/
|
||||
|
||||
p_CClientState__Disconnect = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x55\x57\x41\x56\x48\x83\xEC\x30\x0F\xB6\xEA"), "xxxx?xxxxxxxxxxx");
|
||||
CClientState__Disconnect = p_CClientState__Disconnect.RCast<void(*)(CClientState* thisptr, bool bSendTrackingContext)>(); /*48 89 5C 24 ?? 55 57 41 56 48 83 EC 30 0F B6 EA*/
|
||||
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
|
||||
@ -218,13 +211,6 @@ class VClientState : public IDetour
|
||||
|
||||
p_CClientState__Disconnect = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x56\x57\x41\x54\x41\x55\x41\x57\x48\x83\xEC\x30\x44\x0F\xB6\xFA"), "xxxxxxxxxxxxxxxxx");
|
||||
CClientState__Disconnect = p_CClientState__Disconnect.RCast<void(*)(CClientState* thisptr, bool bSendTrackingContext)>(); /*40 56 57 41 54 41 55 41 57 48 83 EC 30 44 0F B6 FA*/
|
||||
#endif
|
||||
#if defined (GAMEDLL_S2)
|
||||
p_CClientState__CheckForResend = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x48\x89\x74\x24\x00\x48\x89\x7C\x24\x00\x41\x56\x48\x81\xEC\x00\x00\x00\x00\x45\x0F\xB6"), "xxxx?xxxx?xxxx?xxxxx????xxx");
|
||||
CClientState__CheckForResend = p_CClientState__CheckForResend.RCast<void(*)(CClientState* thisptr, const char* a2, std::int64_t a3, char a4, int a5, std::uint8_t* a6)>(); /*48 89 5C 24 ?? 48 89 74 24 ?? 48 89 7C 24 ?? 41 56 48 81 EC ?? ?? ?? ?? 45 0F B6*/
|
||||
#elif defined (GAMEDLL_S3)
|
||||
p_CClientState__CheckForResend = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x48\x89\x74\x24\x00\x48\x89\x7C\x24\x00\x41\x56\x48\x81\xEC\x00\x00\x00\x00\x48\x8B\x32"), "xxxx?xxxx?xxxx?xxxxx????xxx");
|
||||
CClientState__CheckForResend = p_CClientState__CheckForResend.RCast<void(*)(CClientState* thisptr, const char* a2, std::int64_t a3, char a4, int a5, std::uint8_t* a6)>(); /*48 89 5C 24 ?? 48 89 74 24 ?? 48 89 7C 24 ?? 41 56 48 81 EC ?? ?? ?? ?? 48 8B 32*/
|
||||
#endif
|
||||
}
|
||||
virtual void GetVar(void) const
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
#include "core/stdafx.h"
|
||||
#include "tier0/jobthread.h"
|
||||
#include "engine/sys_dll2.h"
|
||||
#include "engine/host_cmd.h"
|
||||
#include "engine/cmodel_bsp.h"
|
||||
#include "rtech/rtech_utils.h"
|
||||
@ -149,7 +150,6 @@ void MOD_ProcessPakQueue()
|
||||
int v20; // er8
|
||||
int v21; // ecx
|
||||
__int64 v22; // rdx
|
||||
__int64 v23; // rbx
|
||||
__int64 v24{}; // rdx
|
||||
__int64 v25{}; // rcx
|
||||
|
||||
@ -163,7 +163,7 @@ void MOD_ProcessPakQueue()
|
||||
{
|
||||
return;
|
||||
}
|
||||
if ((*(unsigned __int8(__fastcall**)(__int64))(*(_QWORD*)*(_QWORD*)g_pFullFileSystem + 696i64 - FSTDIO_OFS))(*(_QWORD*)g_pFullFileSystem) && !*dword_1634F445C)
|
||||
if (FileSystem()->ResetItemCache() && !*dword_1634F445C)
|
||||
{
|
||||
v1 = &*off_141874660;
|
||||
for (i = 0; i < 5; ++i)
|
||||
@ -251,10 +251,9 @@ void MOD_ProcessPakQueue()
|
||||
{
|
||||
if (*byte_16709DDDF)
|
||||
{
|
||||
v23 = *qword_1671061C8;
|
||||
if (*qword_1671061C8)
|
||||
if (*g_pMTVFTaskItem)
|
||||
{
|
||||
if (!*(_BYTE*)(*qword_1671061C8 + 4))
|
||||
if (!*(_BYTE*)(*g_pMTVFTaskItem + 4))
|
||||
{
|
||||
if (*qword_167ED7BC0 || WORD2(*qword_167ED7C68) != HIWORD(*qword_167ED7C68))
|
||||
{
|
||||
@ -274,10 +273,9 @@ void MOD_ProcessPakQueue()
|
||||
}
|
||||
}
|
||||
JT_ReleaseFifoLock((JobFifoLock_s*)&*qword_167ED7BE0);
|
||||
v23 = *qword_1671061C8;
|
||||
}
|
||||
(*(void(__fastcall**)(__int64, __int64))(*(_QWORD*)*(_QWORD*)g_pFullFileSystem + 656i64 - FSTDIO_OFS))(*(_QWORD*)g_pFullFileSystem, 256i64);
|
||||
(*(void(__fastcall**)(__int64, __int64))(*(_QWORD*)*(_QWORD*)g_pFullFileSystem + 648i64 - FSTDIO_OFS))(*(_QWORD*)g_pFullFileSystem, v23);
|
||||
FileSystem()->ResetItemCacheSize(256);
|
||||
FileSystem()->PrecacheTaskItem(*g_pMTVFTaskItem);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +1,4 @@
|
||||
#pragma once
|
||||
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1) || defined (GAMEDLL_S2)
|
||||
constexpr int64_t FSTDIO_OFS = 16i64;
|
||||
#else
|
||||
constexpr int64_t FSTDIO_OFS = 0i64;
|
||||
#endif
|
||||
|
||||
inline CMemory p_CollisionBSPData_LinkPhysics;
|
||||
inline auto CollisionBSPData_LinkPhysics = p_CollisionBSPData_LinkPhysics.RCast<uint64_t(*)(void* thisptr)>();
|
||||
@ -23,7 +18,6 @@ inline char** off_141874660;
|
||||
inline void** unk_141874555;
|
||||
inline void** unk_1418749B0;
|
||||
inline void** unk_141874550;
|
||||
inline int64_t* qword_1671061C8;
|
||||
inline int64_t* qword_167ED7BC0;
|
||||
inline int64_t* qword_167ED7C68;
|
||||
inline int64_t* qword_167ED7BE0;
|
||||
@ -67,7 +61,6 @@ class VModel_BSP : public IDetour
|
||||
spdlog::debug("| VAR: unk_141874555 : {:#18x} |\n", reinterpret_cast<uintptr_t>(unk_141874555));
|
||||
spdlog::debug("| VAR: unk_1418749B0 : {:#18x} |\n", reinterpret_cast<uintptr_t>(unk_1418749B0));
|
||||
spdlog::debug("| VAR: unk_141874550 : {:#18x} |\n", reinterpret_cast<uintptr_t>(unk_141874550));
|
||||
spdlog::debug("| VAR: qword_1671061C8 : {:#18x} |\n", reinterpret_cast<uintptr_t>(qword_1671061C8));
|
||||
spdlog::debug("| VAR: qword_167ED7BC0 : {:#18x} |\n", reinterpret_cast<uintptr_t>(qword_167ED7BC0));
|
||||
spdlog::debug("| VAR: qword_167ED7C68 : {:#18x} |\n", reinterpret_cast<uintptr_t>(qword_167ED7C68));
|
||||
spdlog::debug("| VAR: qword_167ED7BE0 : {:#18x} |\n", reinterpret_cast<uintptr_t>(qword_167ED7BE0));
|
||||
@ -113,7 +106,6 @@ class VModel_BSP : public IDetour
|
||||
unk_141874555 = p_MOD_ProcessPakQueue.Offset(0x40).FindPattern("4C 8D 1D").ResolveRelativeAddressSelf(0x3, 0x7).RCast<void**>();
|
||||
unk_1418749B0 = p_MOD_ProcessPakQueue.Offset(0xA0).FindPattern("48 8D 1D").ResolveRelativeAddressSelf(0x3, 0x7).RCast<void**>();
|
||||
unk_141874550 = p_MOD_ProcessPakQueue.Offset(0x150).FindPattern("48 8D 2D").ResolveRelativeAddressSelf(0x3, 0x7).RCast<void**>();
|
||||
qword_1671061C8 = p_MOD_ProcessPakQueue.Offset(0x200).FindPattern("48 8B 1D").ResolveRelativeAddressSelf(0x3, 0x7).RCast<int64_t*>();
|
||||
qword_167ED7BC0 = p_MOD_ProcessPakQueue.Offset(0x200).FindPattern("48 83 3D").ResolveRelativeAddressSelf(0x3, 0x8).RCast<int64_t*>();
|
||||
qword_167ED7C68 = p_MOD_ProcessPakQueue.Offset(0x200).FindPattern("0F B7 05").ResolveRelativeAddressSelf(0x3, 0x7).RCast<int64_t*>();
|
||||
qword_167ED7BE0 = p_MOD_ProcessPakQueue.Offset(0x250).FindPattern("48 8D 0D").ResolveRelativeAddressSelf(0x3, 0x7).RCast<int64_t*>();
|
||||
|
||||
@ -11,16 +11,20 @@ public:
|
||||
inline CMemory p_CEngineAPI_Connect;
|
||||
inline auto CEngineAPI_Connect = p_CEngineAPI_Connect.RCast<bool (*)(CEngineAPI* thisptr, CreateInterfaceFn factory)>();
|
||||
|
||||
inline CMemory p_PakFile_Init;
|
||||
inline auto PakFile_Init = p_PakFile_Init.RCast<void (*)(char* buffer, char* source, char vpk_file)>();
|
||||
|
||||
inline CMemory p_CEngineAPI_ModInit;
|
||||
inline auto CEngineAPI_ModInit = p_CEngineAPI_ModInit.RCast<bool (*)(CEngineAPI* pEngineAPI, const char* pModName, const char* pGameDir)>();
|
||||
|
||||
inline CMemory p_CEngineAPI_MainLoop;
|
||||
inline auto CEngineAPI_MainLoop = p_CEngineAPI_MainLoop.RCast<bool(*)(void)>();
|
||||
|
||||
inline CMemory g_pMapVPKCache;
|
||||
inline CMemory p_PakFile_Init;
|
||||
inline auto PakFile_Init = p_PakFile_Init.RCast<void (*)(char* buffer, char* source, char vpk_file)>();
|
||||
|
||||
inline CMemory p_ResetMTVFTaskItem;
|
||||
inline auto v_ResetMTVFTaskItem = p_ResetMTVFTaskItem.RCast<void*(*)(void)>();
|
||||
|
||||
inline int64_t* g_pMTVFTaskItem; // struct.
|
||||
inline char* g_szMTVFItemName;
|
||||
|
||||
|
||||
void SysDll2_Attach();
|
||||
@ -34,7 +38,9 @@ class VSys_Dll2 : public IDetour
|
||||
spdlog::debug("| FUN: CEngineAPI::ModInit : {:#18x} |\n", p_CEngineAPI_ModInit.GetPtr());
|
||||
spdlog::debug("| FUN: CEngineAPI::MainLoop : {:#18x} |\n", p_CEngineAPI_MainLoop.GetPtr());
|
||||
spdlog::debug("| FUN: PakFile_Init : {:#18x} |\n", p_PakFile_Init.GetPtr());
|
||||
spdlog::debug("| VAR: g_pMapVPKCache : {:#18x} |\n", g_pMapVPKCache.GetPtr());
|
||||
spdlog::debug("| FUN: ResetMTVFTaskItem : {:#18x} |\n", p_ResetMTVFTaskItem.GetPtr());
|
||||
spdlog::debug("| VAR: g_pMTVFTaskItem : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pMTVFTaskItem));
|
||||
spdlog::debug("| VAR: g_szMTVFItemName : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_szMTVFItemName));
|
||||
spdlog::debug("+----------------------------------------------------------------+\n");
|
||||
}
|
||||
virtual void GetFun(void) const
|
||||
@ -49,6 +55,9 @@ class VSys_Dll2 : public IDetour
|
||||
p_CEngineAPI_MainLoop = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\xE8\x00\x00\x00\x00\x48\x8B\x15\x00\x00\x00\x00\x84\xC0\xB9\x00\x00\x00\x00"), "x????xxx????xxx????").FollowNearCallSelf();
|
||||
p_PakFile_Init = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x44\x88\x44\x24\x00\x53\x55\x56\x57"), "xxxx?xxxx");
|
||||
#endif
|
||||
p_ResetMTVFTaskItem = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x83\xEC\x28\x48\x8B\x15\x00\x00\x00\x00\x48\x85\xD2\x0F\x84\x00\x00\x00\x00\x48\x8B\x0D\x00\x00\x00\x00\x48\x8B\x01\xFF\x90\x00\x00\x00\x00\x33\xC9\xE8\x00\x00\x00\x00\x0F\x28\x05\x00\x00\x00\x00\x0F\x28\x0D\x00\x00\x00\x00\x0F\x11\x05\x00\x00\x00\x00\x0F\x28\x05\x00\x00\x00\x00\x0F\x11\x0D\x00\x00\x00\x00\x0F\x28\x0D\x00\x00\x00\x00\x0F\x11\x05\x00\x00\x00\x00\x0F\x11\x0D\x00\x00\x00\x00\x48\xC7\x05\x00\x00\x00\x00\x00\x00\x00\x00\xFF\x15\x00\x00\x00\x00"),
|
||||
"xxxxxxx????xxxxx????xxx????xxxxx????xxx????xxx????xxx????xxx????xxx????xxx????xxx????xxx????xxx????xxx????????xx????");
|
||||
|
||||
CEngineAPI_Connect = p_CEngineAPI_Connect.RCast<bool (*)(CEngineAPI*, CreateInterfaceFn)>(); /*48 83 EC 28 48 8B 05 ?? ?? ?? ?? 48 8D 0D ?? ?? ?? ?? 48 85 C0 48 89 15 ?? ?? ?? ??*/
|
||||
CEngineAPI_ModInit = p_CEngineAPI_ModInit.RCast<bool (*)(CEngineAPI*, const char*, const char*)>(); /*48 89 5C 24 ?? 48 89 4C 24 ?? 55 56 57 41 54 41 55 41 56 41 57 48 81 EC ?? ?? ?? ?? 4D 8B F8*/
|
||||
CEngineAPI_MainLoop = p_CEngineAPI_MainLoop.RCast<bool(*)(void)>(); /*E8 ?? ?? ?? ?? 48 8B 15 ?? ?? ?? ?? 84 C0 B9 ?? ?? ?? ??*/
|
||||
@ -56,11 +65,8 @@ class VSys_Dll2 : public IDetour
|
||||
}
|
||||
virtual void GetVar(void) const
|
||||
{
|
||||
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
|
||||
g_pMapVPKCache = p_PakFile_Init.FindPatternSelf("4C 8D 35 ?? ?? ?? ?? 44", CMemory::Direction::DOWN, 250).OffsetSelf(0x3).ResolveRelativeAddressSelf().GetPtr();
|
||||
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
|
||||
g_pMapVPKCache = p_PakFile_Init.FindPatternSelf("48 8D 1D ?? ?? ?? ?? 4C", CMemory::Direction::DOWN, 250).OffsetSelf(0x3).ResolveRelativeAddressSelf().GetPtr();
|
||||
#endif
|
||||
g_pMTVFTaskItem = p_ResetMTVFTaskItem.FindPattern("48 8B", CMemory::Direction::DOWN, 250).ResolveRelativeAddressSelf(0x3, 0x7).RCast<int64_t*>();
|
||||
g_szMTVFItemName = p_ResetMTVFTaskItem.FindPattern("C6 05", CMemory::Direction::DOWN, 250).ResolveRelativeAddressSelf(0x2, 0x7).RCast<char*>();
|
||||
}
|
||||
virtual void GetCon(void) const { }
|
||||
virtual void Attach(void) const { }
|
||||
|
||||
@ -72,7 +72,7 @@ bool CNetCon::Shutdown(void)
|
||||
int nError = ::WSACleanup();
|
||||
if (nError != 0)
|
||||
{
|
||||
std::cerr << "Failed to stop winsock via WSACleanup: (" << NET_ErrorString(WSAGetLastError()) << ")" << std::endl;
|
||||
std::cerr << "Failed to stop Winsock via WSACleanup: (" << NET_ErrorString(WSAGetLastError()) << ")" << std::endl;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
@ -401,12 +401,12 @@ public:
|
||||
|
||||
virtual __int64 __fastcall PrecacheTaskItem(__int64 a1) = 0;
|
||||
|
||||
virtual void sub_1403800A0() = 0;
|
||||
virtual void ResetItemCacheSize(int edx) = 0;
|
||||
virtual void __fastcall sub_140380100(__int64 a1) = 0;
|
||||
virtual void __fastcall sub_140380230(char a2) = 0;
|
||||
virtual void* __fastcall sub_1403801F0(const void* a1, unsigned int a2) = 0;
|
||||
virtual void __fastcall sub_140380220(__int64 a1) = 0;
|
||||
virtual bool sub_140380070() = 0;
|
||||
virtual bool ResetItemCache() = 0;
|
||||
virtual char __fastcall sub_1403836D0(int a1, char* a2, unsigned int a3) = 0;
|
||||
virtual __int64 __fastcall sub_140383840(unsigned int a1, __int64 a2, char* a3, unsigned int BufferCount) = 0;
|
||||
virtual const char** __fastcall sub_140383760(unsigned int a1) = 0;
|
||||
|
||||
@ -97,9 +97,6 @@ static_assert(sizeof(ConVar) == 0xA0);
|
||||
inline CMemory p_IConVar_IsFlagSet;
|
||||
inline auto IConVar_IsFlagSet = p_IConVar_IsFlagSet.RCast<bool (*)(ConVar* pConVar, int nFlag)>();
|
||||
|
||||
inline CMemory p_ConVar_SetInfo;
|
||||
inline auto ConVar_SetInfo = p_ConVar_SetInfo.RCast<void* (*)(ConVar* thisptr, int a2, int a3, int a4, void* a5)>();
|
||||
|
||||
inline CMemory p_ConVar_Register;
|
||||
inline auto ConVar_Register = p_ConVar_Register.RCast<void* (*)(ConVar* thisptr, const char* szName, const char* szDefaultValue, int nFlags, const char* szHelpString, bool bMin, float fMin, bool bMax, float fMax, FnChangeCallback_t pCallback, const char* pszUsageString)>();
|
||||
|
||||
@ -120,7 +117,6 @@ class VConVar : public IDetour
|
||||
virtual void GetAdr(void) const
|
||||
{
|
||||
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_pConVarVFTable : {:#18x} |\n", g_pConVarVFTable.GetPtr());
|
||||
spdlog::debug("| VAR: g_pIConVarVFTable : {:#18x} |\n", g_pIConVarVFTable.GetPtr());
|
||||
@ -129,14 +125,12 @@ class VConVar : public IDetour
|
||||
virtual void GetFun(void) const
|
||||
{
|
||||
p_IConVar_IsFlagSet = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x8B\x41\x48\x85\x50\x38"), "xxxxxxx");
|
||||
p_ConVar_SetInfo = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x53\x48\x83\xEC\x60\x48\x8B\xD9\xC6\x41\x10\x00\x33\xC9\x48\x8D\x05\x00\x00\x00\x00\x48\x89\x4C\x24\x00\x0F\x57\xC0\x48\x89\x4C\x24\x00\x48\x89\x03\x48\x8D\x05\x00\x00\x00\x00\x48\x89\x43\x40"), "xxxxxxxxxxxxxxxxxx????xxxx?xxxxxxx?xxxxxx????xxxx");
|
||||
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
|
||||
p_ConVar_Register = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x48\x89\x6C\x24\x00\x48\x89\x74\x24\x00\x48\x89\x7C\x24\x00\x41\x56\x48\x83\xEC\x30\xF3\x0F\x10\x44\x24\x00"), "xxxx?xxxx?xxxx?xxxx?xxxxxxxxxxx?");
|
||||
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
|
||||
p_ConVar_Register = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x48\x89\x6C\x24\x00\x48\x89\x74\x24\x00\x57\x48\x83\xEC\x40\xF3\x0F\x10\x84\x24\x00\x00\x00\x00"), "xxxx?xxxx?xxxx?xxxxxxxxxx????");
|
||||
#endif
|
||||
IConVar_IsFlagSet = p_IConVar_IsFlagSet.RCast<bool (*)(ConVar*, int)>(); /*48 8B 41 48 85 50 38*/
|
||||
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 { }
|
||||
|
||||
@ -1279,7 +1279,7 @@ bool KeyValues::LoadPlaylists(const char* pszPlaylist)
|
||||
//-----------------------------------------------------------------------------
|
||||
bool KeyValues::ParsePlaylists(const char* pszPlaylist)
|
||||
{
|
||||
memset(g_pMapVPKCache, '\0', 0x40); // Clear VPK cache to prevent crash while loading playlist.
|
||||
g_szMTVFItemName[0] = '\0'; // Terminate g_szMTVFTaskName to prevent crash while loading playlist.
|
||||
|
||||
CHAR sPlaylistPath[] = "\x77\x27\x35\x2b\x2c\x6c\x2b\x2c\x2b";
|
||||
PCHAR curr = sPlaylistPath;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user