Synchronize changes from 1.6 branch [ci skip]

297fea1 Addendum to last
de12081 Revert suspension related changes for now, as we need stable master. It will be re-introduced later (revised).

Author: github-actions[bot]

Client/game_sa/CModelInfoSA.cpp

@@ -488,15 +488,6 @@ bool CModelInfoSA::DoIsLoaded()
     return bLoaded;
 }
 
-bool CModelInfoSA::IsCollisionLoaded()
-{
-    m_pInterface = ppModelInfo[m_dwModelID];
-    if (!m_pInterface || !m_pInterface->pColModel)
-        return false;
-
-    return m_pInterface->pColModel->m_data != nullptr;
-}
-
 unsigned short CModelInfoSA::GetFlags()
 {
     return ppModelInfo[m_dwModelID]->usFlags;
@@ -1289,15 +1280,11 @@ unsigned int CModelInfoSA::GetNumRemaps()
 
 void* CModelInfoSA::GetVehicleSuspensionData()
 {
-    if (!GetInterface()->pColModel || !GetInterface()->pColModel->m_data)
-        return nullptr;
     return GetInterface()->pColModel->m_data->m_suspensionLines;
 }
 
 void* CModelInfoSA::SetVehicleSuspensionData(void* pSuspensionLines)
 {
-    if (!GetInterface()->pColModel || !GetInterface()->pColModel->m_data)
-        return nullptr;
     CColDataSA* pColData = GetInterface()->pColModel->m_data;
     void*       pOrigSuspensionLines = pColData->m_suspensionLines;
     pColData->m_suspensionLines = reinterpret_cast<CColLineSA*>(pSuspensionLines);
@@ -1630,7 +1617,7 @@ void CModelInfoSA::RestoreColModel()
 
         // Force the game to load the original collision model data, if we applied a custom collision model before
         // there was any object/building, which would've provoked CColStore to request it.
-        if (m_pInterface->pColModel && !m_pInterface->pColModel->m_data && m_dwReferences > 1)
+        if (!m_pInterface->pColModel->m_data && m_dwReferences > 1)
         {
             pGame->GetStreaming()->RemoveModel(RESOURCE_ID_COL + m_pInterface->pColModel->m_sphere.m_collisionSlot);
         }

Client/game_sa/CModelInfoSA.h

@@ -389,7 +389,6 @@ class CModelInfoSA : public CModelInfo
     void           Remove();
     bool           UnloadUnused();
     bool           IsLoaded();
-    bool           IsCollisionLoaded() override;
     bool           DoIsLoaded();
     unsigned short GetFlags();
     unsigned short GetOriginalFlags();

Client/game_sa/CPhysicalSA.cpp

@@ -22,14 +22,9 @@ CRect* CPhysicalSAInterface::GetBoundRect_(CRect* pRect)
 {
     CVector boundCentre;
     CEntitySAInterface::GetBoundCentre(&boundCentre);
-    CBaseModelInfoSAInterface* pModelInfo = CModelInfoSAInterface::GetModelInfo(m_nModelIndex);
-
-    if (!pModelInfo || !pModelInfo->pColModel)
-        return pRect;
-
-    float fRadius = pModelInfo->pColModel->m_sphere.m_radius;
+    float fRadius = CModelInfoSAInterface::GetModelInfo(m_nModelIndex)->pColModel->m_sphere.m_radius;
     *pRect = CRect(boundCentre.fX - fRadius, boundCentre.fY - fRadius, boundCentre.fX + fRadius, boundCentre.fY + fRadius);
-    pRect->FixIncorrectTopLeft(); // Fix #1613: custom map collision crashes in CPhysical class (infinite loop)
+    pRect->FixIncorrectTopLeft();            // Fix #1613: custom map collision crashes in CPhysical class (infinite loop)
     return pRect;
 }
 

Client/game_sa/CVehicleSA.cpp

@@ -1350,21 +1350,10 @@ CFlyingHandlingEntry* CVehicleSA::GetFlyingHandlingData()
 
 void CVehicleSA::SetHandlingData(CHandlingEntry* pHandling)
 {
-    if (!pHandling)
-        return;
-
-    CVehicleSAInterface* pVehicleInterface = GetVehicleInterface();
-    if (!pVehicleInterface)
-        return;
-
     // Store the handling and recalculate it
     m_pHandlingData = static_cast<CHandlingEntrySA*>(pHandling);
-    pVehicleInterface->pHandlingData = m_pHandlingData->GetInterface();
-    
-    // Only recalculate if collision model is loaded (needed for suspension lines)
-    CModelInfo* pModelInfo = pGame->GetModelInfo(GetModelIndex());
-    if (pModelInfo && pModelInfo->GetInterface()->pColModel && pModelInfo->GetInterface()->pColModel->m_data)
-        RecalculateHandling();
+    GetVehicleInterface()->pHandlingData = m_pHandlingData->GetInterface();
+    RecalculateHandling();
 }
 
 void CVehicleSA::SetFlyingHandlingData(CFlyingHandlingEntry* pFlyingHandling)
@@ -1380,24 +1369,13 @@ void CVehicleSA::RecalculateHandling()
     if (!m_pHandlingData)
         return;
 
-    // Validate vehicle interface
-    CVehicleSAInterface* pInt = GetVehicleInterface();
-    if (!pInt)
-        return;
-
-    // Ensure collision model is loaded before recalculating (needed for suspension lines)
-    CModelInfo* pModelInfo = pGame->GetModelInfo(GetModelIndex());
-    if (!pModelInfo || !pModelInfo->GetInterface()->pColModel || !pModelInfo->GetInterface()->pColModel->m_data)
-        return;
-
     m_pHandlingData->Recalculate();
 
-    // Recalculate the suspension lines (only for vehicles that have suspension)
-    // Already validated that pColModel and m_data exist above
-    if (pModelInfo->IsCar() || pModelInfo->IsMonsterTruck() || pModelInfo->IsTrailer() || pModelInfo->IsBike())
-        RecalculateSuspensionLines();
+    // Recalculate the suspension lines
+    RecalculateSuspensionLines();
 
     // Put it in our interface
+    CVehicleSAInterface* pInt = GetVehicleInterface();
     unsigned int         uiHandlingFlags = m_pHandlingData->GetInterface()->uiHandlingFlags;
     bool                 hydralicsInstalled = false, nitroInstalled = false;
 
@@ -1780,11 +1758,6 @@ void* CVehicleSA::GetPrivateSuspensionLines()
     if (m_pSuspensionLines == NULL)
     {
         CModelInfo* pModelInfo = pGame->GetModelInfo(GetModelIndex());
-        // pColModel can be NULL if collision data hasn't been streamed in yet.
-        // GTA SA loads visual models and collision models separately via CColStore.
-        // The model can be marked as "loaded" even if collision data is still pending.
-        if (!pModelInfo->GetInterface()->pColModel || !pModelInfo->GetInterface()->pColModel->m_data)
-            return NULL;
         CColDataSA* pColData = pModelInfo->GetInterface()->pColModel->m_data;
         if (pModelInfo->IsMonsterTruck())
         {
@@ -1809,9 +1782,6 @@ void* CVehicleSA::GetPrivateSuspensionLines()
 void CVehicleSA::CopyGlobalSuspensionLinesToPrivate()
 {
     CModelInfo* pModelInfo = pGame->GetModelInfo(GetModelIndex());
-    // Collision model may not be loaded yet (see GetPrivateSuspensionLines)
-    if (!pModelInfo->GetInterface()->pColModel || !pModelInfo->GetInterface()->pColModel->m_data)
-        return;
     CColDataSA* pColData = pModelInfo->GetInterface()->pColModel->m_data;
     if (pModelInfo->IsMonsterTruck())
     {
@@ -1839,20 +1809,14 @@ void CVehicleSA::RecalculateSuspensionLines()
 
     DWORD       dwModel = GetModelIndex();
     CModelInfo* pModelInfo = pGame->GetModelInfo(dwModel);
-    if (pModelInfo && (pModelInfo->IsCar() || pModelInfo->IsMonsterTruck() || pModelInfo->IsTrailer()))
+    if (pModelInfo && pModelInfo->IsMonsterTruck() || pModelInfo->IsCar())
     {
         // Trains (Their trailers do as well!)
         if (pModelInfo->IsTrain() || dwModel == 571 || dwModel == 570 || dwModel == 569 || dwModel == 590)
             return;
 
-        // Ensure collision model is loaded before setting up suspension
-        if (!pModelInfo->GetInterface()->pColModel || !pModelInfo->GetInterface()->pColModel->m_data)
-            return;
+        GetVehicleInterface()->SetupSuspensionLines();
 
-        // Note: We skip calling SetupSuspensionLines() because it's GTA SA's native code that can
-        // access pColModel->m_data without validation. If collision model is unloaded during execution
-        // (race condition), it causes crashes. CopyGlobalSuspensionLinesToPrivate() is safer as it
-        // validates collision model before accessing.
         CopyGlobalSuspensionLinesToPrivate();
     }
 }

Client/mods/deathmatch/logic/CClientVehicle.cpp

@@ -4300,15 +4300,6 @@ void CClientVehicle::ApplyHandling()
     if (!m_pVehicle)
         return;
 
-    // Ensure model is loaded before recalculating handling
-    CModelInfo* pModelInfo = g_pGame->GetModelInfo(GetModel());
-    if (!pModelInfo || !pModelInfo->IsLoaded())
-        return;
-
-    // Ensure collision model is loaded before recalculating (needed for suspension lines)
-    if (!pModelInfo->IsCollisionLoaded())
-        return;
-
     m_pVehicle->RecalculateHandling();
 
     if (m_eVehicleType == CLIENTVEHICLE_BMX || m_eVehicleType == CLIENTVEHICLE_BIKE)

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -8905,10 +8905,6 @@ bool CStaticFunctionDefinitions::SetVehicleHandling(CClientVehicle* pVehicle, Ha
     {
         if (SetEntryHandling(pEntry, eProperty, ucValue))
         {
-            CModelInfo* pModelInfo = g_pGame->GetModelInfo(pVehicle->GetModel());
-            if (!pModelInfo || !pModelInfo->IsLoaded())
-                return false;
-
             pVehicle->ApplyHandling();
             return true;
         }
@@ -8926,10 +8922,6 @@ bool CStaticFunctionDefinitions::SetVehicleHandling(CClientVehicle* pVehicle, Ha
     {
         if (SetEntryHandling(pEntry, eProperty, uiValue))
         {
-            CModelInfo* pModelInfo = g_pGame->GetModelInfo(pVehicle->GetModel());
-            if (!pModelInfo || !pModelInfo->IsLoaded())
-                return false;
-
             pVehicle->ApplyHandling();
             return true;
         }
@@ -8947,10 +8939,6 @@ bool CStaticFunctionDefinitions::SetVehicleHandling(CClientVehicle* pVehicle, Ha
     {
         if (SetEntryHandling(pEntry, eProperty, fValue))
         {
-            CModelInfo* pModelInfo = g_pGame->GetModelInfo(pVehicle->GetModel());
-            if (!pModelInfo || !pModelInfo->IsLoaded())
-                return false;
-
             pVehicle->ApplyHandling();
             return true;
         }
@@ -8968,10 +8956,6 @@ bool CStaticFunctionDefinitions::SetVehicleHandling(CClientVehicle* pVehicle, Ha
     {
         if (SetEntryHandling(pEntry, eProperty, strValue))
         {
-            CModelInfo* pModelInfo = g_pGame->GetModelInfo(pVehicle->GetModel());
-            if (!pModelInfo || !pModelInfo->IsLoaded())
-                return false;
-
             pVehicle->ApplyHandling();
             return true;
         }
@@ -8989,10 +8973,6 @@ bool CStaticFunctionDefinitions::SetVehicleHandling(CClientVehicle* pVehicle, Ha
     {
         if (SetEntryHandling(pEntry, eProperty, vecValue))
         {
-            CModelInfo* pModelInfo = g_pGame->GetModelInfo(pVehicle->GetModel());
-            if (!pModelInfo || !pModelInfo->IsLoaded())
-                return false;
-
             pVehicle->ApplyHandling();
             return true;
         }
@@ -9051,10 +9031,6 @@ bool CStaticFunctionDefinitions::ResetVehicleHandling(CClientVehicle* pVehicle)
             pEntry->SetSuspensionUpperLimit(pEntry->GetSuspensionLowerLimit() - 0.1f);
     }
 
-    CModelInfo* pModelInfo = g_pGame->GetModelInfo(pVehicle->GetModel());
-    if (!pModelInfo || !pModelInfo->IsLoaded())
-        return false;
-
     pVehicle->ApplyHandling();
 
     return true;
@@ -9104,10 +9080,6 @@ bool CStaticFunctionDefinitions::ResetVehicleHandlingProperty(CClientVehicle* pV
             return false;
         }
 
-        CModelInfo* pModelInfo = g_pGame->GetModelInfo(pVehicle->GetModel());
-        if (!pModelInfo || !pModelInfo->IsLoaded())
-            return false;
-
         pVehicle->ApplyHandling();
 
         return true;

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

@@ -2518,15 +2518,6 @@ int CLuaVehicleDefs::SetVehicleHandling(lua_State* luaVM)
 
     if (!argStream.HasErrors())
     {
-        // Check if the vehicle model is loaded
-        CModelInfo* pModelInfo = g_pGame->GetModelInfo(pVehicle->GetModel());
-        if (!pModelInfo || !pModelInfo->IsLoaded())
-        {
-            m_pScriptDebugging->LogWarning(luaVM, "setVehicleHandling failed: vehicle model not loaded");
-            lua_pushboolean(luaVM, false);
-            return 1;
-        }
-
         if (argStream.NextIsString())
         {
             SString strProperty;

Client/sdk/game/CModelInfo.h

@@ -162,7 +162,6 @@ class CModelInfo
     virtual BYTE           GetVehicleType() const noexcept = 0;
     virtual void           Request(EModelRequestType requestType, const char* szTag /* = NULL*/) = 0;
     virtual bool           IsLoaded() = 0;
-    virtual bool           IsCollisionLoaded() = 0;
     virtual unsigned short GetFlags() = 0;
     virtual unsigned short GetOriginalFlags() = 0;
     virtual void           SetFlags(unsigned short usFlags) = 0;