Fix dynamic model spawn

TheNormalnij · Dec 25, 2023 · a27cbc7 · a27cbc7
1 parent 1d89b6d
commit a27cbc7
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/Client/game_sa/CModelInfoSA.h b/Client/game_sa/CModelInfoSA.h
@@ -465,6 +465,8 @@ class CModelInfoSA : public CModelInfo
     // Vehicle towing functions
     bool IsTowableBy(CModelInfo* towingModel) override;
 
+    bool IsDynamic() { return m_pInterface ? m_pInterface->usDynamicIndex != 0xffff : false; };
+
 private:
     void CopyStreamingInfoFromModel(ushort usCopyFromModelID);
     void RwSetSupportedUpgrades(RwFrame* parent, DWORD dwModel);

diff --git a/Client/mods/deathmatch/logic/CClientBuildingManager.cpp b/Client/mods/deathmatch/logic/CClientBuildingManager.cpp
@@ -52,3 +52,28 @@ void CClientBuildingManager::RemoveFromList(CClientBuilding* pBuilding)
         m_List.remove(pBuilding);
     }
 }
+
+bool CClientBuildingManager::IsValidModel(uint16_t modelId)
+{
+    if (modelId >= static_cast<uint16_t>(g_pGame->GetBaseIDforTXD()))
+        return false;
+
+     // Clothes and hands cause artefacts
+     if (384 <= modelId && modelId <= 397)
+        return false;
+
+    CModelInfo* pModelInfo = g_pGame->GetModelInfo(modelId);
+    if (!pModelInfo || !pModelInfo->GetInterface())
+        return false;
+
+    if (!pModelInfo->IsAllocatedInArchive())
+        return false;
+
+    if (pModelInfo->IsDynamic())
+    {
+        return false;
+    }
+
+    eModelInfoType eType = pModelInfo->GetModelType();
+    return (eType == eModelInfoType::CLUMP || eType == eModelInfoType::ATOMIC || eType == eModelInfoType::WEAPON || eType == eModelInfoType::TIME);
+}
diff --git a/Client/mods/deathmatch/logic/CClientBuildingManager.h b/Client/mods/deathmatch/logic/CClientBuildingManager.h
@@ -28,6 +28,8 @@ class CClientBuildingManager
 
     const std::list<CClientBuilding*>& GetBuildings() { return m_List; };
 
+    static bool IsValidModel(uint16_t modelId);
+
 private:
     void AddToList(CClientBuilding* pBuilding) { m_List.push_back(pBuilding); }
     void RemoveFromList(CClientBuilding* pBuilding);

diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaBuildingDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaBuildingDefs.cpp
@@ -40,8 +40,8 @@ CClientBuilding* CLuaBuildingDefs::CreateBuilding(lua_State* const luaVM, uint16
     if (!pResource)
         return false;
 
-    if (!CClientObjectManager::IsValidModel(modelId))
-        throw std::invalid_argument("Invalid model id");
+    if (!CClientBuildingManager::IsValidModel(modelId))
+        throw std::invalid_argument("Invalid building model id");
 
     if (!g_pGame->GetPools()->HasFreeBuildingSlot())
         throw std::invalid_argument("No free slot in buildings pool");

diff --git a/Client/sdk/game/CModelInfo.h b/Client/sdk/game/CModelInfo.h
@@ -246,4 +246,5 @@ class CModelInfo
     virtual bool IsTowableBy(CModelInfo* towingModel) = 0;
 
     virtual unsigned int GetParentID() = 0;
+    virtual bool         IsDynamic() = 0;
 };