Review

Author: FileEX

Client/game_sa/CModelInfoSA.cpp

@@ -1538,7 +1538,12 @@ void CModelInfoSA::RestoreOriginalModel()
         CBaseModelInfoSAInterface* currentInterface = ppModelInfo[m_dwModelID];
         ppModelInfo[m_dwModelID] = MapGet(m_convertedModelInterfaces, m_dwModelID);
 
-        delete currentInterface;
+        if (currentInterface)
+        {
+            ppModelInfo[m_dwModelID]->usNumberOfRefs = currentInterface->usNumberOfRefs;
+            delete currentInterface;
+        }
+
         MapRemove(m_convertedModelInterfaces, m_dwModelID);
     }
 
@@ -1814,13 +1819,13 @@ void CModelInfoSA::MakeClumpModel(ushort usBaseID)
 bool CModelInfoSA::ConvertToClump()
 {
     // Get current interface
-    CAtomicModelInfoSAInterface* currentAtomicInterface = static_cast<CAtomicModelInfoSAInterface*>(ppModelInfo[m_dwModelID]);
-    if (!currentAtomicInterface)
+    CBaseModelInfoSAInterface* currentModelInterface = ppModelInfo[m_dwModelID];
+    if (!currentModelInterface)
         return false;
 
     // Create new clump interface
     CClumpModelInfoSAInterface* newClumpInterface = new CClumpModelInfoSAInterface();
-    MemCpyFast(newClumpInterface, currentAtomicInterface, sizeof(CClumpModelInfoSAInterface));
+    MemCpyFast(newClumpInterface, currentModelInterface, sizeof(CBaseModelInfoSAInterface));
     newClumpInterface->m_nAnimFileIndex = -1;
 
     // (FileEX): We do not destroy or set pRwObject to nullptr here
@@ -1834,7 +1839,7 @@ bool CModelInfoSA::ConvertToClump()
     ppModelInfo[m_dwModelID] = newClumpInterface;
 
     // Store original interface
-    MapSet(m_convertedModelInterfaces, m_dwModelID, static_cast<CBaseModelInfoSAInterface*>(currentAtomicInterface));
+    MapSet(m_convertedModelInterfaces, m_dwModelID, currentModelInterface);
     return true;
 }
 
@@ -1851,7 +1856,7 @@ bool CModelInfoSA::ConvertToAtomic()
 
     // (FileEX): We do not destroy or set pRwObject to nullptr here
     // because our IsLoaded code expects the RwObject to exist.
-    // We destroy the old RwObject in CFileLoader_SetRelatedModelInfoCB after passing the IsLoaded condition in the SetCustomModel.
+    // We destroy the old RwObject in CRenderWareSA::ReplaceAllAtomicsInModel after passing the IsLoaded condition in the SetCustomModel.
 
     // Set CAtomicModelInfo vtbl after copying data
     newAtomicInterface->VFTBL = reinterpret_cast<CBaseModelInfo_SA_VTBL*>(VTBL_CAtomicModelInfo);

Client/game_sa/CModelInfoSA.h

@@ -64,12 +64,6 @@ static void* ARRAY_ModelInfo = *(void**)(0x403DA4 + 3);
 
 #define     VAR_CTempColModels_ModelPed1    0x968DF0
 
-#define     FUNC_CClumpModelInfo_SetClump 0x4C4F70
-#define     FUNC_CClumpModelInfo_DeleteRwObject 0x4C4E70
-
-#define     FUNC_CAtomicModelInfo_SetAtomic     0x4C4360
-#define     FUNC_CAtomicModelInfo_DeleteRwObject 0x4C4440
-
 #define VTBL_CClumpModelInfo 0x85BD30
 #define VTBL_CAtomicModelInfo 0x85BBF0
 
@@ -262,15 +256,15 @@ class CClumpModelInfoSAInterface : public CBaseModelInfoSAInterface
         uint32_t m_nAnimFileIndex;
     };
 
-    void DeleteRwObject() { ((void(__thiscall*)(CClumpModelInfoSAInterface*))FUNC_CClumpModelInfo_DeleteRwObject)(this); }
-    void SetClump(RpClump* clump) { ((void(__thiscall*)(CClumpModelInfoSAInterface*, RpClump*))FUNC_CClumpModelInfo_SetClump)(this, clump); }
+    void DeleteRwObject() { ((void(__thiscall*)(CClumpModelInfoSAInterface*))0x4C4E70)(this); }
+    void SetClump(RpClump* clump) { ((void(__thiscall*)(CClumpModelInfoSAInterface*, RpClump*))0x4C4F70)(this, clump); }
 };
 
 class CAtomicModelInfoSAInterface : public CBaseModelInfoSAInterface
 {
 public:
-    void DeleteRwObject() { ((void(__thiscall*)(CAtomicModelInfoSAInterface*))FUNC_CAtomicModelInfo_DeleteRwObject)(this); }
-    void SetAtomic(RpAtomic* atomic) { ((void(__thiscall*)(CAtomicModelInfoSAInterface*, RpAtomic*))FUNC_CAtomicModelInfo_SetAtomic)(this, atomic); }
+    void DeleteRwObject() { ((void(__thiscall*)(CAtomicModelInfoSAInterface*))0x4C4440)(this); }
+    void SetAtomic(RpAtomic* atomic) { ((void(__thiscall*)(CAtomicModelInfoSAInterface*, RpAtomic*))0x4C4360)(this, atomic); }
 };
 
 class CTimeModelInfoSAInterface : public CAtomicModelInfoSAInterface