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

FileSystem improvements

Browse Source 
Deref g_pFullFileSystem (most engine functions use this pointer instead of the direct address of g_pFileSystem_Stdio).
This commit is contained in:
Kawe Mazidjatari 2022-06-16 21:19:04 +02:00
parent 034df40755
commit 87e3313e22
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
r5dev/filesystem/filesystem.cpp
View File

@ -2,6 +2,14 @@
#include "vpklib/packedstore.h"
#include "filesystem/filesystem.h"
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
CFileSystem_Stdio* FileSystem()
{
return *g_pFullFileSystem;
}
//-----------------------------------------------------------------------------
// Purpose: create the search path.
// Input : *pPath -
@ -51,5 +59,5 @@ VPKData_t* IFileSystem::MountVPK(const char* pPath)
}
///////////////////////////////////////////////////////////////////////////////
IFileSystem* g_pFullFileSystem = nullptr;
CFileSystem_Stdio** g_pFullFileSystem = nullptr;
CFileSystem_Stdio* g_pFileSystem_Stdio = nullptr;

7
r5dev/filesystem/filesystem.h
View File

@ -19,9 +19,10 @@ class CFileSystem_Stdio : public IFileSystem, public CBaseFileSystem
{
};
extern IFileSystem* g_pFullFileSystem; // Ptr to g_pFileSystem_Stdio.
extern CFileSystem_Stdio* g_pFileSystem_Stdio;
extern CFileSystem_Stdio** g_pFullFileSystem; // Ptr to g_pFileSystem_Stdio.
extern CFileSystem_Stdio* g_pFileSystem_Stdio;
CFileSystem_Stdio* FileSystem();
///////////////////////////////////////////////////////////////////////////////
class VFileSystem_Stdio : public IDetour
{
@ -35,7 +36,7 @@ class VFileSystem_Stdio : public IDetour
virtual void GetVar(void) const
{
g_pFullFileSystem = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x8B\x0D\x00\x00\x00\x00\x45\x33\xC0\x48\x83\xC1\x08\x48\x8B\x01"),
"xxx????xxxxxxxxxx").ResolveRelativeAddressSelf(0x3, 0x7).RCast<IFileSystem*>();
"xxx????xxxxxxxxxx").ResolveRelativeAddressSelf(0x3, 0x7).RCast<CFileSystem_Stdio**>();
g_pFileSystem_Stdio = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x8D\x05\x00\x00\x00\x00\x48\x89\x05\x00\x00\x00\x00\x48\x8D\x0D\x00\x00\x00\x00\x48\x8D\x05\x00\x00\x00\x00\x48\x89\x05\x00\x00\x00\x00\xE9\x00\x00\x00\x00"),
"xxx????xxx????xxx????xxx????xxx????x????").FindPattern("48 89", CMemory::Direction::DOWN, 512, 1).ResolveRelativeAddressSelf(0x3, 0x7).RCast<CFileSystem_Stdio*>();

2
r5dev/vpc/keyvalues.cpp
View File

@ -1238,7 +1238,7 @@ void KeyValues::InitPlaylists(void)
//-----------------------------------------------------------------------------
void KeyValues::InitFileSystem(void)
{
KeyValues* pMainFile = KeyValues::ReadKeyValuesFile(g_pFileSystem_Stdio, "GameInfo.txt");
KeyValues* pMainFile = KeyValues::ReadKeyValuesFile(FileSystem(), "GameInfo.txt");
if (pMainFile)
{
KeyValues* pFileSystemInfo = pMainFile->FindKey("FileSystem", false);

15
r5dev/vstdlib/callback.cpp
View File

@ -687,21 +687,14 @@ void VPK_Mount_f(const CCommand& args)
return;
}
if (g_pFullFileSystem) // Initialized when g_pFileSystem_Stdio is initialized (global engine pointer).
VPKData_t* pPakData = FileSystem()->MountVPK(args.Arg(1));
if (pPakData)
{
VPKData_t* pPakData = g_pFileSystem_Stdio->MountVPK(args.Arg(1));
if (pPakData)
{
DevMsg(eDLL_T::FS, "Mounted VPK file '%s' with handle '%i'\n", args.Arg(1), pPakData->m_nHandle);
}
else
{
Warning(eDLL_T::FS, "Unable to mount VPK file '%s': non-existent VPK file\n", args.Arg(1));
}
DevMsg(eDLL_T::FS, "Mounted VPK file '%s' with handle '%i'\n", args.Arg(1), pPakData->m_nHandle);
}
else
{
Warning(eDLL_T::FS, "Unable to mount VPK file '%s': '%s' is not initalized\n", args.Arg(1), VAR_NAME(g_pFullFileSystem));
Warning(eDLL_T::FS, "Unable to mount VPK file '%s': non-existent VPK file\n", args.Arg(1));
}
}