From 1308ae30bf160331aa07c4fbb2f12c8e9c88b893 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Fri, 6 May 2022 02:49:38 +0200
Subject: [PATCH] Additional CMDLCache cleanup

---
 r5dev/bsplib/bsplib.cpp      |  2 +-
 r5dev/datacache/mdlcache.cpp | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/r5dev/bsplib/bsplib.cpp b/r5dev/bsplib/bsplib.cpp
index 16900ccc..6798c651 100644
--- a/r5dev/bsplib/bsplib.cpp
+++ b/r5dev/bsplib/bsplib.cpp
@@ -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;
diff --git a/r5dev/datacache/mdlcache.cpp b/r5dev/datacache/mdlcache.cpp
index 4803335f..4ef4907b 100644
--- a/r5dev/datacache/mdlcache.cpp
+++ b/r5dev/datacache/mdlcache.cpp
@@ -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;
 }