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

Cleanup for 'StreamDB_Init'

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-05-27 22:31:52 +02:00
parent 83c57fbd99
commit 2cc47f60e2
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
r5dev/materialsystem/cmaterialsystem.cpp
View File

@ -12,9 +12,9 @@
// (overrides level name if stbsp field has value in prerequisites file)
// Input : *pszStreamDBFile -
//---------------------------------------------------------------------------------
void HStreamDB_Init(const char* pszStreamDBFile)
void StreamDB_Init(const char* pszStreamDBFile)
{
std::ostringstream ostream;
ostringstream ostream;
ostream << "platform\\scripts\\levels\\settings\\" << pszStreamDBFile << ".json";
fs::path fsPath = fs::current_path() /= ostream.str();
@ -23,7 +23,7 @@ void HStreamDB_Init(const char* pszStreamDBFile)
nlohmann::json jsIn;
try
{
std::ifstream iPakLoadDefFile(fsPath, std::ios::binary); // Parse prerequisites file.
ifstream iPakLoadDefFile(fsPath, std::ios::binary); // Parse prerequisites file.
iPakLoadDefFile >> jsIn;
iPakLoadDefFile.close();
@ -31,19 +31,19 @@ void HStreamDB_Init(const char* pszStreamDBFile)
{
if (!jsIn["stbsp"].is_null())
{
std::string svStreamDBFile = jsIn["stbsp"].get<std::string>();
DevMsg(eDLL_T::MS, "StreamDB_Init: Loading override STBSP file '%s.stbsp'\n", svStreamDBFile.c_str(), pszStreamDBFile);
StreamDB_Init(svStreamDBFile.c_str());
string svStreamDBFile = jsIn["stbsp"].get<string>();
DevMsg(eDLL_T::MS, "%s: Loading override STBSP file '%s.stbsp'\n", __FUNCTION__, svStreamDBFile.c_str(), pszStreamDBFile);
v_StreamDB_Init(svStreamDBFile.c_str());
return;
}
}
}
catch (const std::exception& ex)
{
DevMsg(eDLL_T::MS, "StreamDB_Init: Exception while parsing STBSP override: '%s'\n", ex.what());
DevMsg(eDLL_T::MS, "%s: Exception while parsing STBSP override: '%s'\n", __FUNCTION__, ex.what());
}
}
StreamDB_Init(pszStreamDBFile);
v_StreamDB_Init(pszStreamDBFile);
}
//---------------------------------------------------------------------------------
@ -70,12 +70,12 @@ void* __fastcall DispatchDrawCall(int64_t a1, uint64_t a2, int a3, int a4, int64
///////////////////////////////////////////////////////////////////////////////
void CMaterialSystem_Attach()
{
DetourAttach((LPVOID*)&StreamDB_Init, &HStreamDB_Init);
DetourAttach((LPVOID*)&v_StreamDB_Init, &StreamDB_Init);
DetourAttach((LPVOID*)&v_DispatchDrawCall, &DispatchDrawCall);
}
void CMaterialSystem_Detach()
{
DetourDetach((LPVOID*)&StreamDB_Init, &HStreamDB_Init);
DetourDetach((LPVOID*)&v_StreamDB_Init, &StreamDB_Init);
DetourDetach((LPVOID*)&v_DispatchDrawCall, &DispatchDrawCall);
}

4
r5dev/materialsystem/cmaterialsystem.h
View File

@ -18,7 +18,7 @@ inline CMemory p_DrawStreamOverlay;
inline auto DrawStreamOverlay = p_DrawStreamOverlay.RCast<const char* (*)(void* thisptr, uint8_t* a2, void* unused, void* a4)>();
inline CMemory p_StreamDB_Init;
inline auto StreamDB_Init = p_StreamDB_Init.RCast<void (*)(const char* pszStreamDbFile)>();
inline auto v_StreamDB_Init = p_StreamDB_Init.RCast<void (*)(const char* pszStreamDbFile)>();
inline CMemory s_pRenderContext;
@ -60,7 +60,7 @@ class VMaterialSystem : public IDetour
DrawStreamOverlay = p_DrawStreamOverlay.RCast<const char* (*)(void*, uint8_t*, void*, void*)>(); // 41 56 B8 ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 2B E0 C6 02 00 //
p_StreamDB_Init = g_mGameDll.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\x54\x41\x56\x41\x57\x48\x83\xEC\x40\x48\x8B\xE9"), "xxxx?xxxx?xxxx?xxxx?xxxxxxxxxxxxx");
StreamDB_Init = p_StreamDB_Init.RCast<void (*)(const char*)>(); /*48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 48 89 7C 24 ?? 41 54 41 56 41 57 48 83 EC 40 48 8B E9*/
v_StreamDB_Init = p_StreamDB_Init.RCast<void (*)(const char*)>(); /*48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 48 89 7C 24 ?? 41 54 41 56 41 57 48 83 EC 40 48 8B E9*/
#endif // !DEDICATED
}
virtual void GetVar(void) const