Allow allocating models server-side

Client/game_sa/CModelInfoSA.cpp

@@ -1,11 +1,11 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        game_sa/CModelInfoSA.cpp
  *  PURPOSE:     Entity model information handler
  *
- *  Multi Theft Auto is available from http://www.multitheftauto.com/
+ *  Multi Theft Auto is available from https://multitheftauto.com/
  *
  *****************************************************************************/
 
@@ -538,7 +538,7 @@ void CModelInfoSA::SetIdeFlags(unsigned int uiFlags)
     switch (GetModelType())
     {
         case eModelInfoType::ATOMIC:
-        case eModelInfoType::TIME:
+        case eModelInfoType::TIMED_OBJECT:
         {
             // SetAtomicModelInfoFlags
             m_pInterface->bIsRoad = ideFlags.bIsRoad;
@@ -842,7 +842,7 @@ bool CModelInfoSA::SetTime(char cHourOn, char cHourOff)
     if (!m_pInterface)
         return false;
 
-    if (GetModelType() != eModelInfoType::TIME)
+    if (GetModelType() != eModelInfoType::TIMED_OBJECT)
         return false;
 
     CTimeInfoSAInterface* pTime = &static_cast<CTimeModelInfoSAInterface*>(m_pInterface)->timeInfo;
@@ -861,7 +861,7 @@ bool CModelInfoSA::GetTime(char& cHourOn, char& cHourOff)
     if (!m_pInterface)
         return false;
 
-    if (GetModelType() != eModelInfoType::TIME)
+    if (GetModelType() != eModelInfoType::TIMED_OBJECT)
         return false;
 
     CTimeInfoSAInterface* pTime = &static_cast<CTimeModelInfoSAInterface*>(m_pInterface)->timeInfo;
@@ -1498,7 +1498,7 @@ bool CModelInfoSA::SetCustomModel(RpClump* pClump)
             break;
         case eModelInfoType::ATOMIC:
         case eModelInfoType::LOD_ATOMIC:
-        case eModelInfoType::TIME:
+        case eModelInfoType::TIMED_OBJECT:
             success = pGame->GetRenderWare()->ReplaceAllAtomicsInModel(pClump, static_cast<unsigned short>(m_dwModelID));
             break;
         default:
@@ -1804,7 +1804,7 @@ void CModelInfoSA::DeallocateModel(void)
         case eModelInfoType::CLUMP:
             delete reinterpret_cast<CClumpModelInfoSAInterface*>(ppModelInfo[m_dwModelID]);
             break;
-        case eModelInfoType::TIME:
+        case eModelInfoType::TIMED_OBJECT:
             delete reinterpret_cast<CTimeModelInfoSAInterface*>(ppModelInfo[m_dwModelID]);
             break;
         default:
@@ -2022,7 +2022,7 @@ void CModelInfoSA::RestoreAllObjectsPropertiesGroups()
 
 eModelInfoType CModelInfoSA::GetModelType()
 {
-    return ((eModelInfoType(*)())m_pInterface->VFTBL->GetModelType)();
+    return (eModelInfoType)((uint8_t(*)())m_pInterface->VFTBL->GetModelType)();
 }
 
 bool CModelInfoSA::IsTowableBy(CModelInfo* towingModel)

Client/mods/deathmatch/logic/CClientModel.cpp

@@ -1,11 +1,12 @@
 /*****************************************************************************
  *
  *  PROJECT:     Multi Theft Auto
- *               (Shared logic for modifications)
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        mods/deathmatch/logic/CClientModel.h
  *  PURPOSE:     Model handling class
  *
+ *  Multi Theft Auto is available from https://multitheftauto.com/
+ *
  *****************************************************************************/
 
 #include "StdInc.h"
@@ -152,8 +153,8 @@ void CClientModel::RestoreDFF(CModelInfo* pModelInfo)
             unloadModelsAndCallEvents(pPedManager->IterBegin(), pPedManager->IterEnd(), 0, [](auto& element) { element.SetModel(0); });
             break;
         }
-        case eClientModelType::CLUMP:
         case eClientModelType::OBJECT:
+        case eClientModelType::CLUMP:
         case eClientModelType::TIMED_OBJECT:
         {
             const auto&    objects = &g_pClientGame->GetManager()->GetObjectManager()->GetObjects();

Client/mods/deathmatch/logic/CClientModel.h

@@ -1,11 +1,12 @@
 /*****************************************************************************
  *
  *  PROJECT:     Multi Theft Auto
- *               (Shared logic for modifications)
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        mods/deathmatch/logic/CClientModel.h
  *  PURPOSE:     Model handling class
  *
+ *  Multi Theft Auto is available from https://multitheftauto.com/
+ *
  *****************************************************************************/
 
 class CClientModel;
@@ -33,7 +34,7 @@ class CClientModel final
 
 public:
     CClientModel(CClientManager* pManager, int iModelID, eClientModelType eModelType);
-    ~CClientModel(void);
+    ~CClientModel();
 
     int              GetModelID(void) const { return m_iModelID; };
     eClientModelType GetModelType(void) const { return m_eModelType; };

Client/mods/deathmatch/logic/CClientModelManager.cpp

@@ -1,14 +1,14 @@
 /*****************************************************************************
  *
  *  PROJECT:     Multi Theft Auto
- *               (Shared logic for modifications)
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        mods/deathmatch/logic/CClientModelManager.cpp
  *  PURPOSE:     Model manager class
  *
  *****************************************************************************/
 
 #include "StdInc.h"
+
 CClientModelManager::CClientModelManager() : m_Models(std::make_unique<std::shared_ptr<CClientModel>[]>(g_pGame->GetBaseIDforCOL()))
 {
     const unsigned int uiMaxModelID = g_pGame->GetBaseIDforCOL();
@@ -44,9 +44,8 @@ void CClientModelManager::Add(const std::shared_ptr<CClientModel>& pModel)
     m_modelCount++;
 }
 
-bool CClientModelManager::Remove(const std::shared_ptr<CClientModel>& pModel)
+bool CClientModelManager::Remove(const int modelId)
 {
-    int modelId = pModel->GetModelID();
     if (m_Models[modelId] != nullptr)
     {
         m_Models[modelId]->RestoreEntitiesUsingThisModel();
@@ -57,6 +56,18 @@ bool CClientModelManager::Remove(const std::shared_ptr<CClientModel>& pModel)
     return false;
 }
 
+bool CClientModelManager::RemoveClientModel(const int modelId)
+{
+    if (m_Models[modelId] == nullptr)
+        return false;
+
+    // Model was allocated clientside
+    if (!m_Models[modelId]->GetParentResource())
+        return false;
+
+    return Remove(modelId);
+}
+
 int CClientModelManager::GetFirstFreeModelID(void)
 {
     const unsigned int uiMaxModelID = g_pGame->GetBaseIDforCOL();
@@ -124,6 +135,47 @@ void CClientModelManager::DeallocateModelsAllocatedByResource(CResource* pResour
     for (unsigned int i = 0; i < uiMaxModelID; i++)
     {
         if (m_Models[i] != nullptr && m_Models[i]->GetParentResource() == pResource)
-            Remove(m_Models[i]);
+            Remove(i);
+    }
+}
+
+bool CClientModelManager::AllocateModelFromParent(uint32_t uiNewModelID, uint32_t uiParentModelID)
+{
+    eModelInfoType eModelType = g_pGame->GetModelInfo(uiParentModelID)->GetModelType();
+
+    std::shared_ptr<CClientModel> pModel = FindModelByID(uiNewModelID);
+    if (pModel)
+        return false;
+
+    eClientModelType clientModelType;
+
+    switch (eModelType)
+    {
+        case eModelInfoType::ATOMIC:
+            clientModelType = eClientModelType::OBJECT;
+            break;
+        case eModelInfoType::TIMED_OBJECT:
+            clientModelType = eClientModelType::TIMED_OBJECT;
+            break;
+        case eModelInfoType::CLUMP:
+            clientModelType = eClientModelType::CLUMP;
+            break;
+        case eModelInfoType::VEHICLE:
+            clientModelType = eClientModelType::VEHICLE;
+            break;
+        case eModelInfoType::PED:
+            clientModelType = eClientModelType::PED;
+            break;
+        default:
+            return false;
     }
+
+    pModel = std::make_shared<CClientModel>(g_pClientGame->GetManager(), uiNewModelID, clientModelType);
+
+    Add(pModel);
+
+    if (pModel->Allocate(uiParentModelID))
+        return true;
+
+    return false;
 }

Client/mods/deathmatch/logic/CClientModelManager.h

@@ -1,11 +1,12 @@
 /*****************************************************************************
  *
  *  PROJECT:     Multi Theft Auto
- *               (Shared logic for modifications)
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        mods/deathmatch/logic/CClientModelManager.h
  *  PURPOSE:     Model manager class
  *
+ *  Multi Theft Auto is available from https://multitheftauto.com/
+ *
  *****************************************************************************/
 
 class CClientModelManager;
@@ -32,7 +33,8 @@ class CClientModelManager
     void RemoveAll(void);
 
     void Add(const std::shared_ptr<CClientModel>& pModel);
-    bool Remove(const std::shared_ptr<CClientModel>& pModel);
+    bool Remove(const int modelId);
+    bool RemoveClientModel(const int modelId);
 
     int GetFirstFreeModelID(void);
     int GetFreeTxdModelID();
@@ -43,6 +45,7 @@ class CClientModelManager
     std::vector<std::shared_ptr<CClientModel>> GetModelsByType(eClientModelType type, const unsigned int minModelID = 0);
 
     void DeallocateModelsAllocatedByResource(CResource* pResource);
+    bool AllocateModelFromParent(uint32_t usModelID, uint32_t usParentModel);
 
 private:
     std::unique_ptr<std::shared_ptr<CClientModel>[]> m_Models;

Client/mods/deathmatch/logic/CClientObjectManager.cpp

@@ -110,7 +110,7 @@ bool CClientObjectManager::IsValidModel(unsigned long ulObjectModel)
         return false;
 
     eModelInfoType eType = pModelInfo->GetModelType();
-    return (eType == eModelInfoType::CLUMP || eType == eModelInfoType::ATOMIC || eType == eModelInfoType::WEAPON || eType == eModelInfoType::TIME);
+    return (eType == eModelInfoType::CLUMP || eType == eModelInfoType::ATOMIC || eType == eModelInfoType::WEAPON || eType == eModelInfoType::TIMED_OBJECT);
 }
 
 bool CClientObjectManager::IsBreakableModel(unsigned long ulObjectModel)

Client/mods/deathmatch/logic/CClientVehicleManager.cpp

@@ -1,11 +1,12 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
- *               (Shared logic for modifications)
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
- *  FILE:        mods/shared_logic/CClientVehicleManager.cpp
+ *  FILE:        mods/deathmatch/logic/CClientVehicleManager.cpp
  *  PURPOSE:     Vehicle entity manager class
  *
+ *  Multi Theft Auto is available from https://multitheftauto.com/
+ *
  *****************************************************************************/
 
 #include "StdInc.h"
@@ -432,6 +433,14 @@ bool CClientVehicleManager::IsStandardModel(unsigned long ulModel)
     return ulModel >= 400 && ulModel <= 611;
 }
 
+unsigned long CClientVehicleManager::GetRootModelId(unsigned long ulModel)
+{
+    if (IsStandardModel(ulModel))
+        return ulModel;
+
+    return g_pGame->GetModelInfo(ulModel)->GetParentID();
+}
+
 eClientVehicleType CClientVehicleManager::GetVehicleType(unsigned long ulModel)
 {
     // Valid vehicle id?
@@ -625,42 +634,42 @@ unsigned char CClientVehicleManager::ConvertIndexToGameSeat(unsigned long ulMode
 
 bool CClientVehicleManager::HasTurret(unsigned long ulModel)
 {
-    return (IsStandardModel(ulModel) && (g_ulVehicleAttributes[ulModel - 400] & VEHICLE_HAS_TURRENT));
+    return ((g_ulVehicleAttributes[GetRootModelId(ulModel) - 400] & VEHICLE_HAS_TURRENT));
 }
 
 bool CClientVehicleManager::HasSirens(unsigned long ulModel)
 {
-    return (IsStandardModel(ulModel) && (g_ulVehicleAttributes[ulModel - 400] & VEHICLE_HAS_SIRENS));
+    return ((g_ulVehicleAttributes[GetRootModelId(ulModel) - 400] & VEHICLE_HAS_SIRENS));
 }
 
 bool CClientVehicleManager::HasTaxiLight(unsigned long ulModel)
 {
-    return (IsStandardModel(ulModel) && (g_ulVehicleAttributes[ulModel - 400] & VEHICLE_HAS_TAXI_LIGHTS));
+    return ((g_ulVehicleAttributes[GetRootModelId(ulModel) - 400] & VEHICLE_HAS_TAXI_LIGHTS));
 }
 
 bool CClientVehicleManager::HasSearchLight(unsigned long ulModel)
 {
-    return (IsStandardModel(ulModel) && (g_ulVehicleAttributes[ulModel - 400] & VEHICLE_HAS_SEARCH_LIGHT));
+    return ((g_ulVehicleAttributes[GetRootModelId(ulModel) - 400] & VEHICLE_HAS_SEARCH_LIGHT));
 }
 
 bool CClientVehicleManager::HasLandingGears(unsigned long ulModel)
 {
-    return (IsStandardModel(ulModel) && (g_ulVehicleAttributes[ulModel - 400] & VEHICLE_HAS_LANDING_GEARS));
+    return ((g_ulVehicleAttributes[GetRootModelId(ulModel) - 400] & VEHICLE_HAS_LANDING_GEARS));
 }
 
 bool CClientVehicleManager::HasAdjustableProperty(unsigned long ulModel)
 {
-    return (IsStandardModel(ulModel) && (g_ulVehicleAttributes[ulModel - 400] & VEHICLE_HAS_ADJUSTABLE_PROPERTY));
+    return ((g_ulVehicleAttributes[GetRootModelId(ulModel) - 400] & VEHICLE_HAS_ADJUSTABLE_PROPERTY));
 }
 
 bool CClientVehicleManager::HasSmokeTrail(unsigned long ulModel)
 {
-    return (IsStandardModel(ulModel) && (g_ulVehicleAttributes[ulModel - 400] & VEHICLE_HAS_SMOKE_TRAIL));
+    return ((g_ulVehicleAttributes[GetRootModelId(ulModel) - 400] & VEHICLE_HAS_SMOKE_TRAIL));
 }
 
 bool CClientVehicleManager::HasDamageModel(unsigned long ulModel)
 {
-    return HasDamageModel(GetVehicleType(ulModel));
+    return HasDamageModel(GetVehicleType(GetRootModelId(ulModel)));
 }
 
 bool CClientVehicleManager::HasDamageModel(eClientVehicleType Type)
@@ -681,6 +690,8 @@ bool CClientVehicleManager::HasDamageModel(eClientVehicleType Type)
 
 bool CClientVehicleManager::HasDoors(unsigned long ulModel)
 {
+    ulModel = GetRootModelId(ulModel);
+
     bool bHasDoors = false;
 
     if (HasDamageModel(ulModel) == true)

Client/mods/deathmatch/logic/CClientVehicleManager.h

@@ -1,11 +1,12 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
- *               (Shared logic for modifications)
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
- *  FILE:        mods/shared_logic/CClientVehicleManager.h
+ *  FILE:        mods/deathmatch/logic/CClientVehicleManager.h
  *  PURPOSE:     Vehicle entity manager class header
  *
+ *  Multi Theft Auto is available from https://multitheftauto.com/
+ *
  *****************************************************************************/
 
 #pragma once
@@ -35,6 +36,7 @@ class CClientVehicleManager
     static bool               IsTrainModel(unsigned long ulModel);
     static bool               IsValidModel(unsigned long ulModel);
     static bool               IsStandardModel(unsigned long ulModel);
+    static unsigned long      GetRootModelId(unsigned long ulModel);
     static eClientVehicleType GetVehicleType(unsigned long ulModel);
     static unsigned char      GetMaxPassengerCount(unsigned long ulModel);
     static unsigned char      ConvertIndexToGameSeat(unsigned long ulModel, unsigned char ucIndex);