Allow allocating clump models (PR #3131)

Author: TheNormalnij

Client/game_sa/CModelInfoSA.cpp

@@ -1710,6 +1710,22 @@ void CModelInfoSA::MakeTimedObjectModel(ushort usBaseID)
     CopyStreamingInfoFromModel(usBaseID);
 }
 
+void CModelInfoSA::MakeClumpModel(ushort usBaseID)
+{
+    CClumpModelInfoSAInterface* pNewInterface = new CClumpModelInfoSAInterface();
+    CBaseModelInfoSAInterface* pBaseObjectInfo = ppModelInfo[usBaseID];
+    MemCpyFast(pNewInterface, pBaseObjectInfo, sizeof(CClumpModelInfoSAInterface));
+    pNewInterface->usNumberOfRefs = 0;
+    pNewInterface->pRwObject = nullptr;
+    pNewInterface->usUnknown = 65535;
+    pNewInterface->usDynamicIndex = 65535;
+
+    ppModelInfo[m_dwModelID] = pNewInterface;
+
+    m_dwParentID = usBaseID;
+    CopyStreamingInfoFromModel(usBaseID);
+}
+
 void CModelInfoSA::MakeVehicleAutomobile(ushort usBaseID)
 {
     CVehicleModelInfoSAInterface* m_pInterface = new CVehicleModelInfoSAInterface();
@@ -1743,6 +1759,9 @@ void CModelInfoSA::DeallocateModel(void)
         case eModelInfoType::ATOMIC:
             delete reinterpret_cast<CBaseModelInfoSAInterface*>(ppModelInfo[m_dwModelID]);
             break;
+        case eModelInfoType::CLUMP:
+            delete reinterpret_cast<CClumpModelInfoSAInterface*>(ppModelInfo[m_dwModelID]);
+            break;
         case eModelInfoType::TIME:
             delete reinterpret_cast<CTimeModelInfoSAInterface*>(ppModelInfo[m_dwModelID]);
             break;

Client/game_sa/CModelInfoSA.h

@@ -243,6 +243,16 @@ struct CTimeInfoSAInterface
     short m_wOtherTimeModel;
 };
 
+class CClumpModelInfoSAInterface : public CBaseModelInfoSAInterface
+{
+public:
+    union
+    {
+        char*    m_animFileName;
+        uint32_t m_nAnimFileIndex;
+    };
+};
+
 class CTimeModelInfoSAInterface : public CBaseModelInfoSAInterface
 {
 public:
@@ -435,6 +445,7 @@ class CModelInfoSA : public CModelInfo
     void         MakeObjectModel(ushort usBaseModelID);
     void         MakeVehicleAutomobile(ushort usBaseModelID);
     void         MakeTimedObjectModel(ushort usBaseModelID);
+    void         MakeClumpModel(ushort usBaseModelID);
     void         DeallocateModel(void);
     unsigned int GetParentID() { return m_dwParentID; };
 

Client/mods/deathmatch/logic/CClientModel.cpp

@@ -50,6 +50,13 @@ bool CClientModel::Allocate(ushort usParentID)
                 return true;
             }
             break;
+        case eClientModelType::CLUMP:
+            if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID))
+            {
+                pModelInfo->MakeClumpModel(usParentID);
+                return true;
+            }
+            break;
         case eClientModelType::TIMED_OBJECT:
             if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID))
             {
@@ -114,6 +121,7 @@ void CClientModel::RestoreEntitiesUsingThisModel()
             unloadModelsAndCallEvents(pPedManager->IterBegin(), pPedManager->IterEnd(), 0, [](auto& element) { element.SetModel(0); });
             break;
         }
+        case eClientModelType::CLUMP:
         case eClientModelType::OBJECT:
         case eClientModelType::TIMED_OBJECT:
         {

Client/mods/deathmatch/logic/CClientModel.h

@@ -20,6 +20,7 @@ enum class eClientModelType
     OBJECT,
     VEHICLE,
     TIMED_OBJECT,
+    CLUMP,
 };
 
 class CResource;

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

@@ -674,6 +674,7 @@ ADD_ENUM(eClientModelType::PED, "ped")
 ADD_ENUM(eClientModelType::OBJECT, "object")
 ADD_ENUM(eClientModelType::VEHICLE, "vehicle")
 ADD_ENUM(eClientModelType::TIMED_OBJECT, "timed-object")
+ADD_ENUM(eClientModelType::CLUMP, "clump")
 IMPLEMENT_ENUM_CLASS_END("client-model-type")
 
 // Sound effects

Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp

@@ -852,6 +852,12 @@ int CLuaEngineDefs::EngineRequestModel(lua_State* luaVM)
                             case eClientModelType::PED:
                                 usParentID = 7;            // male01
                                 break;
+                            case eClientModelType::TIMED_OBJECT:
+                                usParentID = 4715;            // LTSLAsky1_LAn2
+                                break;
+                            case eClientModelType::CLUMP:
+                                usParentID = 3425;            // nt_windmill (windmill)
+                                break;
                             case eClientModelType::OBJECT:
                                 usParentID = 1337;            // BinNt07_LA (trash can)
                                 break;

Client/sdk/game/CModelInfo.h

@@ -231,6 +231,7 @@ class CModelInfo
     virtual void      MakeObjectModel(unsigned short usBaseID) = 0;
     virtual void      MakeVehicleAutomobile(unsigned short usBaseID) = 0;
     virtual void      MakeTimedObjectModel(unsigned short usBaseID) = 0;
+    virtual void      MakeClumpModel(unsigned short usBaseID) = 0;
 
     virtual SVehicleSupportedUpgrades GetVehicleSupportedUpgrades() = 0;
     virtual void                      ResetSupportedUpgrades() = 0;