From c24e8a9f212ba77fff95cc38add76609e1aa3c44 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Thu, 24 Nov 2022 11:58:32 +0100 Subject: [PATCH] Rename 'MOD_' to 'Mod_' The engine names these functions as 'Mod_'. --- r5dev/engine/cmodel_bsp.cpp | 38 ++++++++-------- r5dev/engine/cmodel_bsp.h | 58 ++++++++++++------------ r5dev/materialsystem/cmaterialsystem.cpp | 2 +- r5dev/vpc/keyvalues.cpp | 2 +- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/r5dev/engine/cmodel_bsp.cpp b/r5dev/engine/cmodel_bsp.cpp index 92cc1f30..35ee999f 100644 --- a/r5dev/engine/cmodel_bsp.cpp +++ b/r5dev/engine/cmodel_bsp.cpp @@ -29,7 +29,7 @@ KeyValues* s_pLevelSetKV = nullptr; // Input : *pszLevelName - // Output : true if level name deviates from previous level //----------------------------------------------------------------------------- -bool MOD_LevelHasChanged(const char* pszLevelName) +bool Mod_LevelHasChanged(const char* pszLevelName) { return (s_svLevelName.compare(pszLevelName) != 0); } @@ -37,7 +37,7 @@ bool MOD_LevelHasChanged(const char* pszLevelName) //----------------------------------------------------------------------------- // Purpose: gets all installed maps //----------------------------------------------------------------------------- -void MOD_GetAllInstalledMaps() +void Mod_GetAllInstalledMaps() { std::lock_guard l(g_MapVecMutex); g_vAllMaps.clear(); // Clear current list. @@ -75,7 +75,7 @@ void MOD_GetAllInstalledMaps() // a3 - // Output : __int64 //----------------------------------------------------------------------------- -__int64 __fastcall MOD_GetQueuedPakHandle(char* a1, char* a2, __int64 a3) +__int64 __fastcall Mod_GetQueuedPakHandle(char* a1, char* a2, __int64 a3) { char v3; // al signed int v4; // er11 @@ -129,7 +129,7 @@ __int64 __fastcall MOD_GetQueuedPakHandle(char* a1, char* a2, __int64 a3) //----------------------------------------------------------------------------- // Purpose: processes queued pak files //----------------------------------------------------------------------------- -void MOD_ProcessPakQueue() +void Mod_ProcessPakQueue() { char v0; // bl char** v1; // r10 @@ -242,7 +242,7 @@ void MOD_ProcessPakQueue() } g_pakLoadApi->UnloadPak(*(RPakHandle_t*)v10); - MOD_UnloadPakFile(); // Unload mod pak files. + Mod_UnloadPakFile(); // Unload mod pak files. s_pLevelSetKV->DeleteThis(); // Delete current level settings if we drop all paks.. s_pLevelSetKV = nullptr; @@ -273,7 +273,7 @@ void MOD_ProcessPakQueue() } while (v19); if (!v20) goto LABEL_37; - MOD_GetQueuedPakHandle(v17, *((char**)v15 + 34), 260i64); + Mod_GetQueuedPakHandle(v17, *((char**)v15 + 34), 260i64); if (v15[5]) break; *(_DWORD*)v15 = -1; @@ -321,7 +321,7 @@ void MOD_ProcessPakQueue() if (s_bBasePaksInitialized && !s_bLevelResourceInitialized) { s_bLevelResourceInitialized = true; - MOD_PreloadLevelPaks(g_pHostState->m_levelName); + Mod_PreloadLevelPaks(g_pHostState->m_levelName); } *(_DWORD*)v15 = g_pakLoadApi->LoadAsync(v17, g_pMallocPool.GetPtr(), 4, 0); @@ -353,13 +353,13 @@ void MOD_ProcessPakQueue() // Input : *szLevelName - // Output : true on success, false on failure //----------------------------------------------------------------------------- -bool MOD_LoadPakForMap(const char* szLevelName) +bool Mod_LoadPakForMap(const char* szLevelName) { - if (MOD_LevelHasChanged(szLevelName)) + if (Mod_LevelHasChanged(szLevelName)) s_bLevelResourceInitialized = false; s_svLevelName = szLevelName; - return v_MOD_LoadPakForMap(szLevelName); + return v_Mod_LoadPakForMap(szLevelName); } //----------------------------------------------------------------------------- @@ -367,11 +367,11 @@ bool MOD_LoadPakForMap(const char* szLevelName) // Input : *pszLevelName - // Output : KeyValues* //----------------------------------------------------------------------------- -KeyValues* MOD_GetLevelSettings(const char* pszLevelName) +KeyValues* Mod_GetLevelSettings(const char* pszLevelName) { if (s_pLevelSetKV) { - if (!MOD_LevelHasChanged(pszLevelName)) + if (!Mod_LevelHasChanged(pszLevelName)) { return s_pLevelSetKV; } @@ -390,9 +390,9 @@ KeyValues* MOD_GetLevelSettings(const char* pszLevelName) // Purpose: loads required pakfile assets for specified BSP level // Input : &svSetFile - //----------------------------------------------------------------------------- -void MOD_PreloadLevelPaks(const char* pszLevelName) +void Mod_PreloadLevelPaks(const char* pszLevelName) { - KeyValues* pSettingsKV = MOD_GetLevelSettings(pszLevelName); + KeyValues* pSettingsKV = Mod_GetLevelSettings(pszLevelName); if (!pSettingsKV) return; @@ -422,7 +422,7 @@ void MOD_PreloadLevelPaks(const char* pszLevelName) //----------------------------------------------------------------------------- // Purpose: unloads all pakfiles loaded by the SDK //----------------------------------------------------------------------------- -void MOD_UnloadPakFile(void) +void Mod_UnloadPakFile(void) { for (const RPakHandle_t& it : g_vLoadedPakHandle) { @@ -437,12 +437,12 @@ void MOD_UnloadPakFile(void) void CModelBsp_Attach() { - DetourAttach((LPVOID*)&v_MOD_LoadPakForMap, &MOD_LoadPakForMap); - DetourAttach((LPVOID*)&v_MOD_ProcessPakQueue, &MOD_ProcessPakQueue); + DetourAttach((LPVOID*)&v_Mod_LoadPakForMap, &Mod_LoadPakForMap); + DetourAttach((LPVOID*)&v_Mod_ProcessPakQueue, &Mod_ProcessPakQueue); } void CModelBsp_Detach() { - DetourDetach((LPVOID*)&v_MOD_LoadPakForMap, &MOD_LoadPakForMap); - DetourDetach((LPVOID*)&v_MOD_ProcessPakQueue, &MOD_ProcessPakQueue); + DetourDetach((LPVOID*)&v_Mod_LoadPakForMap, &Mod_LoadPakForMap); + DetourDetach((LPVOID*)&v_Mod_ProcessPakQueue, &Mod_ProcessPakQueue); } \ No newline at end of file diff --git a/r5dev/engine/cmodel_bsp.h b/r5dev/engine/cmodel_bsp.h index 745a0e24..a39a9baa 100644 --- a/r5dev/engine/cmodel_bsp.h +++ b/r5dev/engine/cmodel_bsp.h @@ -6,11 +6,11 @@ //----------------------------------------------------------------------------- class KeyValues; -inline CMemory p_MOD_LoadPakForMap; -inline auto v_MOD_LoadPakForMap = p_MOD_LoadPakForMap.RCast(); +inline CMemory p_Mod_LoadPakForMap; +inline auto v_Mod_LoadPakForMap = p_Mod_LoadPakForMap.RCast(); -inline CMemory p_MOD_ProcessPakQueue; -inline auto v_MOD_ProcessPakQueue = p_MOD_ProcessPakQueue.RCast(); +inline CMemory p_Mod_ProcessPakQueue; +inline auto v_Mod_ProcessPakQueue = p_Mod_ProcessPakQueue.RCast(); inline float* dword_14B383420; inline int32_t * dword_1634F445C; @@ -24,18 +24,18 @@ inline void** unk_141874550; inline int64_t* qword_167ED7BC0; inline int64_t* qword_167ED7C68; -inline auto sub_14045BAC0 = p_MOD_ProcessPakQueue.RCast<__int64(*)(__int64(__fastcall* a1)(__int64, _DWORD*, __int64, _QWORD*), JobFifoLock_s* pFifoLock, __int64 a3, __int64 a4)>(); -inline auto sub_14045A1D0 = p_MOD_ProcessPakQueue.RCast<__int64(*)(unsigned __int8(__fastcall* a1)(_QWORD), JobFifoLock_s* pFifoLock, __int64 a3, __int64 a4, volatile signed __int64* a5, char a6)>(); -inline auto sub_140441220 = p_MOD_ProcessPakQueue.RCast(); +inline auto sub_14045BAC0 = p_Mod_ProcessPakQueue.RCast<__int64(*)(__int64(__fastcall* a1)(__int64, _DWORD*, __int64, _QWORD*), JobFifoLock_s* pFifoLock, __int64 a3, __int64 a4)>(); +inline auto sub_14045A1D0 = p_Mod_ProcessPakQueue.RCast<__int64(*)(unsigned __int8(__fastcall* a1)(_QWORD), JobFifoLock_s* pFifoLock, __int64 a3, __int64 a4, volatile signed __int64* a5, char a6)>(); +inline auto sub_140441220 = p_Mod_ProcessPakQueue.RCast(); extern bool s_bBasePaksInitialized; extern vector g_vAllMaps; -bool MOD_LevelHasChanged(const char* pszLevelName); -void MOD_GetAllInstalledMaps(); -KeyValues* MOD_GetLevelSettings(const char* pszLevelName); -void MOD_PreloadLevelPaks(const char* pszLevelName); -void MOD_UnloadPakFile(void); +bool Mod_LevelHasChanged(const char* pszLevelName); +void Mod_GetAllInstalledMaps(); +KeyValues* Mod_GetLevelSettings(const char* pszLevelName); +void Mod_PreloadLevelPaks(const char* pszLevelName); +void Mod_UnloadPakFile(void); void CModelBsp_Attach(); void CModelBsp_Detach(); @@ -44,8 +44,8 @@ class VModel_BSP : public IDetour { virtual void GetAdr(void) const { - spdlog::debug("| FUN: MOD_LoadPakForMap : {:#18x} |\n", p_MOD_LoadPakForMap.GetPtr()); - spdlog::debug("| FUN: MOD_ProcessPakQueue : {:#18x} |\n", p_MOD_ProcessPakQueue.GetPtr()); + spdlog::debug("| FUN: Mod_LoadPakForMap : {:#18x} |\n", p_Mod_LoadPakForMap.GetPtr()); + spdlog::debug("| FUN: Mod_ProcessPakQueue : {:#18x} |\n", p_Mod_ProcessPakQueue.GetPtr()); spdlog::debug("+----------------------------------------------------------------+\n"); spdlog::debug("| FUN: sub_14045BAC0 : {:#18x} |\n", reinterpret_cast(sub_14045BAC0)); spdlog::debug("| FUN: sub_14045A1D0 : {:#18x} |\n", reinterpret_cast(sub_14045A1D0)); @@ -69,11 +69,11 @@ class VModel_BSP : public IDetour p_MOD_LoadPakForMap = g_GameDll.FindPatternSIMD(reinterpret_cast("\x48\x81\xEC\x00\x00\x00\x00\x4C\x8B\xC1\x48\x8D\x15\x00\x00\x00\x00\x48\x8D\x4C\x24\x00\xE8\x00\x00\x00\x00\x4C\x8D\x0D\x00\x00\x00\x00"), "xxx????xxxxxx????xxxx?x????xxx????"); v_MOD_LoadPakForMap = p_MOD_LoadPakForMap.RCast(); /*48 81 EC ? ? ? ? 4C 8B C1 48 8D 15 ? ? ? ? 48 8D 4C 24 ? E8 ? ? ? ? 4C 8D 0D ? ? ? ?*/ #elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3) - p_MOD_LoadPakForMap = g_GameDll.FindPatternSIMD(reinterpret_cast("\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"); - v_MOD_LoadPakForMap = p_MOD_LoadPakForMap.RCast(); /*48 81 EC ? ? ? ? 0F B6 05 ? ? ? ? 4C 8D 05 ? ? ? ? 84 C0*/ + p_Mod_LoadPakForMap = g_GameDll.FindPatternSIMD(reinterpret_cast("\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"); + v_Mod_LoadPakForMap = p_Mod_LoadPakForMap.RCast(); /*48 81 EC ? ? ? ? 0F B6 05 ? ? ? ? 4C 8D 05 ? ? ? ? 84 C0*/ #endif - p_MOD_ProcessPakQueue = g_GameDll.FindPatternSIMD(reinterpret_cast("\x40\x53\x48\x83\xEC\x00\xF3\x0F\x10\x05\x00\x00\x00\x00\x32\xDB"), "xxxxx?xxxx????xx"); - v_MOD_ProcessPakQueue = p_MOD_ProcessPakQueue.RCast(); /*40 53 48 83 EC ?? F3 0F 10 05 ? ? ? ? 32 DB*/ + p_Mod_ProcessPakQueue = g_GameDll.FindPatternSIMD(reinterpret_cast("\x40\x53\x48\x83\xEC\x00\xF3\x0F\x10\x05\x00\x00\x00\x00\x32\xDB"), "xxxxx?xxxx????xx"); + v_Mod_ProcessPakQueue = p_Mod_ProcessPakQueue.RCast(); /*40 53 48 83 EC ?? F3 0F 10 05 ? ? ? ? 32 DB*/ sub_14045BAC0 = g_GameDll.FindPatternSIMD(reinterpret_cast("\x48\x89\x5C\x24\x00\x4C\x89\x4C\x24\x00\x4C\x89\x44\x24\x00\x55\x56\x57\x41\x54\x41\x55\x41\x56\x41\x57\x48\x83\xEC\x60"), "xxxx?xxxx?xxxx?xxxxxxxxxxxxxxx").RCast<__int64(*)(__int64(__fastcall* a1)(__int64, _DWORD*, __int64, _QWORD*), JobFifoLock_s* pFifoLock, __int64 a3, __int64 a4)>(); sub_14045A1D0 = g_GameDll.FindPatternSIMD(reinterpret_cast("\x4C\x89\x4C\x24\x00\x4C\x89\x44\x24\x00\x48\x89\x54\x24\x00\x48\x89\x4C\x24\x00\x55\x53\x56\x57\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8D\x6C\x24\x00"), "xxxx?xxxx?xxxx?xxxx?xxxxxxxxxxxxxxxx?").RCast<__int64(*)(unsigned __int8(__fastcall* a1)(_QWORD), JobFifoLock_s* pFifoLock, __int64 a3, __int64 a4, volatile signed __int64* a5, char a6)>(); @@ -85,17 +85,17 @@ class VModel_BSP : public IDetour } virtual void GetVar(void) const { - dword_14B383420 = p_MOD_ProcessPakQueue.FindPattern("F3 0F 10").ResolveRelativeAddressSelf(0x4, 0x8).RCast(); - dword_1634F445C = p_MOD_ProcessPakQueue.FindPattern("8B 05").ResolveRelativeAddressSelf(0x2, 0x6).RCast(); - qword_167ED7BB8 = p_MOD_ProcessPakQueue.Offset(0x10).FindPatternSelf("48 83").ResolveRelativeAddressSelf(0x3, 0x8).RCast(); - qword_14180A098 = p_MOD_ProcessPakQueue.Offset(0x20).FindPatternSelf("83 3D").ResolveRelativeAddressSelf(0x2, 0x7).RCast(); - byte_16709DDDF = p_MOD_ProcessPakQueue.Offset(0x20).FindPatternSelf("88 1D").ResolveRelativeAddressSelf(0x2, 0x6).RCast(); - off_141874660 = p_MOD_ProcessPakQueue.Offset(0x40).FindPatternSelf("4C 8D 15").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); - unk_141874555 = p_MOD_ProcessPakQueue.Offset(0x40).FindPatternSelf("4C 8D 1D").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); - unk_1418749B0 = p_MOD_ProcessPakQueue.Offset(0xA0).FindPatternSelf("48 8D 1D").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); - unk_141874550 = p_MOD_ProcessPakQueue.Offset(0x150).FindPatternSelf("48 8D 2D").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); - qword_167ED7BC0 = p_MOD_ProcessPakQueue.Offset(0x200).FindPatternSelf("48 83 3D").ResolveRelativeAddressSelf(0x3, 0x8).RCast(); - qword_167ED7C68 = p_MOD_ProcessPakQueue.Offset(0x200).FindPatternSelf("0F B7 05").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); + dword_14B383420 = p_Mod_ProcessPakQueue.FindPattern("F3 0F 10").ResolveRelativeAddressSelf(0x4, 0x8).RCast(); + dword_1634F445C = p_Mod_ProcessPakQueue.FindPattern("8B 05").ResolveRelativeAddressSelf(0x2, 0x6).RCast(); + qword_167ED7BB8 = p_Mod_ProcessPakQueue.Offset(0x10).FindPatternSelf("48 83").ResolveRelativeAddressSelf(0x3, 0x8).RCast(); + qword_14180A098 = p_Mod_ProcessPakQueue.Offset(0x20).FindPatternSelf("83 3D").ResolveRelativeAddressSelf(0x2, 0x7).RCast(); + byte_16709DDDF = p_Mod_ProcessPakQueue.Offset(0x20).FindPatternSelf("88 1D").ResolveRelativeAddressSelf(0x2, 0x6).RCast(); + off_141874660 = p_Mod_ProcessPakQueue.Offset(0x40).FindPatternSelf("4C 8D 15").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); + unk_141874555 = p_Mod_ProcessPakQueue.Offset(0x40).FindPatternSelf("4C 8D 1D").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); + unk_1418749B0 = p_Mod_ProcessPakQueue.Offset(0xA0).FindPatternSelf("48 8D 1D").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); + unk_141874550 = p_Mod_ProcessPakQueue.Offset(0x150).FindPatternSelf("48 8D 2D").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); + qword_167ED7BC0 = p_Mod_ProcessPakQueue.Offset(0x200).FindPatternSelf("48 83 3D").ResolveRelativeAddressSelf(0x3, 0x8).RCast(); + qword_167ED7C68 = p_Mod_ProcessPakQueue.Offset(0x200).FindPatternSelf("0F B7 05").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); (*((char**)(&qword_167ED7C68))) -= 6; } diff --git a/r5dev/materialsystem/cmaterialsystem.cpp b/r5dev/materialsystem/cmaterialsystem.cpp index 137a8c41..1ab85f5f 100644 --- a/r5dev/materialsystem/cmaterialsystem.cpp +++ b/r5dev/materialsystem/cmaterialsystem.cpp @@ -19,7 +19,7 @@ //--------------------------------------------------------------------------------- void StreamDB_Init(const char* pszLevelName) { - KeyValues* pSettingsKV = MOD_GetLevelSettings(pszLevelName); + KeyValues* pSettingsKV = Mod_GetLevelSettings(pszLevelName); if (pSettingsKV) { diff --git a/r5dev/vpc/keyvalues.cpp b/r5dev/vpc/keyvalues.cpp index 9e01ead8..107cb56c 100644 --- a/r5dev/vpc/keyvalues.cpp +++ b/r5dev/vpc/keyvalues.cpp @@ -1269,7 +1269,7 @@ void KeyValues::InitPlaylists(void) } } } - MOD_GetAllInstalledMaps(); // Parse all installed maps. + Mod_GetAllInstalledMaps(); // Parse all installed maps. } //-----------------------------------------------------------------------------