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

Additional CMDLCache cleanup

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-05-06 02:49:38 +02:00
parent 215f205508
commit 1308ae30bf
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/bsplib/bsplib.cpp
View File

@ -367,7 +367,7 @@ void* __fastcall BuildPropStaticFrustumCullMap(int64_t a1, int64_t a2, unsigned
handle = *reinterpret_cast<uint16_t*>(a7 + 0x140);
studio = g_MDLCache->FindMDL(g_MDLCache, handle, nullptr);
v55 = *reinterpret_cast<int64_t*>(g_MDLCache->GetStudioMaterialGlue(g_MDLCache, *reinterpret_cast<uint16_t*>((a7 + 320)))); // Gets some object containing pointer to 2 CMaterialGlue vtables.
v55 = *reinterpret_cast<int64_t*>(g_MDLCache->GetMaterialTable(g_MDLCache, *reinterpret_cast<uint16_t*>((a7 + 320)))); // Gets some object containing pointer to 2 CMaterialGlue vtables.
v56 = *reinterpret_cast<uint16_t*>(a5 + 0x20);
v57 = reinterpret_cast<int64_t>(studio) + 2i64 * v56 * studio->numskinref + studio->skinindex;
v58 = 0;

11
r5dev/datacache/mdlcache.cpp
View File

@ -208,29 +208,26 @@ studiohdr_t* CMDLCache::FindUncachedMDL(CMDLCache* cache, MDLHandle_t handle, st
//-----------------------------------------------------------------------------
studiohdr_t* CMDLCache::GetStudioHDR(CMDLCache* pMDLCache, MDLHandle_t handle)
{
__int64 v2; // rbx
studiodata_t* pStudioData; // rbx
__int64 v4; // rdx
studiodata_t*pStudioData; // rbx
studiohdr_t* result = nullptr; // rax
void* v4; // rdx
if (!handle)
{
LABEL_ERROR:
if (!g_pMDLFallback->m_hErrorMDL)
Error(eDLL_T::ENGINE, "Model with handle \"%hu\" not found and \"%s\" couldn't be loaded.\n", handle, ERROR_MODEL);
return g_pMDLFallback->m_pErrorHDR;
}
v2 = handle;
EnterCriticalSection(reinterpret_cast<LPCRITICAL_SECTION>(&*m_MDLMutex));
pStudioData = m_MDLDict->Find(handle);
LeaveCriticalSection(reinterpret_cast<LPCRITICAL_SECTION>(&*m_MDLMutex));
if (*(_QWORD*)(pStudioData))
{
v4 = *(_QWORD*)(*(_QWORD*)(*(_QWORD*)pStudioData + 8i64) + 24i64);
v4 = *(void**)(*((_QWORD*)pStudioData->m_MDLCache + 1) + 24i64);
if (v4)
result = (studiohdr_t*)(v4 + 16);
result = (studiohdr_t*)((char*)v4 + 0x10);
}
return result;
}