Synchronize changes from 1.6 master branch [ci skip]

5081111 Allow setElementCollisionsEnabled for buildings (PR #3384)
437dbcd Bump follow-redirects from 1.15.2 to 1.15.6 in /utils/localization/generate-images (PR #3343)

Author: github-actions[bot]

Client/mods/deathmatch/logic/CClientBuilding.cpp

@@ -10,7 +10,7 @@
 
 #include "StdInc.h"
 
-CClientBuilding::CClientBuilding(class CClientManager* pManager, ElementID ID, uint16_t usModelId, const CVector &pos, const CVector &rot, uint8_t interior)
+CClientBuilding::CClientBuilding(class CClientManager* pManager, ElementID ID, uint16_t usModelId, const CVector& pos, const CVector& rot, uint8_t interior)
     : ClassInit(this),
       CClientEntity(ID),
       m_pBuildingManager(pManager->GetBuildingManager()),
@@ -19,6 +19,7 @@ CClientBuilding::CClientBuilding(class CClientManager* pManager, ElementID ID, u
       m_vRot(rot),
       m_interior(interior),
       m_pBuilding(nullptr),
+      m_usesCollision(true),
       m_pHighBuilding(nullptr),
       m_pLowBuilding(nullptr)
 {
@@ -91,7 +92,7 @@ void CClientBuilding::SetInterior(uint8_t ucInterior)
         return;
     m_interior = ucInterior;
     Recreate();
-} 
+}
 
 void CClientBuilding::SetModel(uint16_t model)
 {
@@ -102,6 +103,18 @@ void CClientBuilding::SetModel(uint16_t model)
     }
 }
 
+void CClientBuilding::SetUsesCollision(bool state)
+{
+    if (m_usesCollision == state)
+        return;
+
+    m_usesCollision = state;
+    if (m_pBuilding)
+    {
+        m_pBuilding->SetUsesCollision(state);
+    }
+}
+
 void CClientBuilding::Create()
 {
     if (m_pBuilding)
@@ -115,6 +128,10 @@ void CClientBuilding::Create()
 
     m_pBuilding = g_pGame->GetPools()->GetBuildingsPool().AddBuilding(this, m_usModelId, &m_vPos, &vRot4D, m_interior);
 
+    if (!m_usesCollision)
+    {
+        m_pBuilding->SetUsesCollision(m_usesCollision);
+    }
     if (m_pHighBuilding)
     {
         m_pHighBuilding->GetBuildingEntity()->SetLod(m_pBuilding);

Client/mods/deathmatch/logic/CClientBuilding.h

@@ -43,6 +43,11 @@ class CClientBuilding : public CClientEntity
 
     eClientEntityType GetType() const { return CCLIENTBUILDING; }
 
+    void SetUsesCollision(bool state);
+
+    void Create();
+    void Destroy();
+
     bool IsValid() const noexcept { return m_pBuilding != nullptr; };
 
 
@@ -52,9 +57,6 @@ class CClientBuilding : public CClientEntity
 
 
 private:
-    void Create();
-    void Destroy();
-
     CClientBuilding* GetHighLodBuilding() const { return m_pHighBuilding; }; 
     void SetHighLodBuilding(CClientBuilding* pHighBuilding = nullptr) { m_pHighBuilding = pHighBuilding; };
 
@@ -72,6 +74,7 @@ class CClientBuilding : public CClientEntity
     CVector    m_vPos;
     CVector    m_vRot;
     uint8_t    m_interior;
+    bool       m_usesCollision;
 
     CClientBuilding* m_pHighBuilding;
     CClientBuilding* m_pLowBuilding;

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -3756,6 +3756,11 @@ bool CStaticFunctionDefinitions::SetElementCollisionsEnabled(CClientEntity& Enti
             Ped.SetUsesCollision(bEnabled);
             break;
         }
+        case CCLIENTBUILDING:
+        {
+            static_cast<CClientBuilding&>(Entity).SetUsesCollision(bEnabled);
+            break;
+        }
         default:
             return false;
     }