Merge branch 'master' into nitro

Author: Proxy-99

Client/game_sa/CBuildingsPoolSA.cpp

@@ -18,6 +18,7 @@
 #include "CPtrNodeSingleListSA.h"
 #include "MemSA.h"
 #include "CVehicleSA.h"
+#include "CBuildingRemovalSA.h"
 
 extern CGameSA* pGame;
 
@@ -48,6 +49,16 @@ inline bool CBuildingsPoolSA::AddBuildingToPool(CClientBuilding* pClientBuilding
     return true;
 }
 
+CClientEntity* CBuildingsPoolSA::GetClientBuilding(CBuildingSAInterface* pGameInterface) const noexcept
+{
+    std::uint32_t poolIndex = (*m_ppBuildingPoolInterface)->GetObjectIndex(pGameInterface);
+
+    if (poolIndex == static_cast<std::uint32_t>(-1))
+        return nullptr;
+
+    return m_buildingPool.entities[poolIndex].pClientEntity;
+}
+
 CBuilding* CBuildingsPoolSA::AddBuilding(CClientBuilding* pClientBuilding, uint16_t modelId, CVector* vPos, CVector4D* vRot, uint8_t interior)
 {
     if (!HasFreeBuildingSlot())
@@ -174,6 +185,9 @@ void CBuildingsPoolSA::RestoreBackup()
     if (!m_pOriginalBuildingsBackup)
         return;
 
+    auto* worldSA = pGame->GetWorld();
+    auto* buildingRemovealSA = static_cast<CBuildingRemovalSA*>(pGame->GetBuildingRemoval());
+
     auto& originalData = *m_pOriginalBuildingsBackup;
     auto  pBuildsingsPool = (*m_ppBuildingPoolInterface);
     for (size_t i = 0; i < MAX_BUILDINGS; i++)
@@ -184,7 +198,8 @@ void CBuildingsPoolSA::RestoreBackup()
             auto pBuilding = pBuildsingsPool->GetObject(i);
             *pBuilding = originalData[i].second;
 
-            pGame->GetWorld()->Add(pBuilding, CBuildingPool_Constructor);
+            worldSA->Add(pBuilding, CBuildingPool_Constructor);
+            buildingRemovealSA->AddDataBuilding(pBuilding);
         }
     }
 

Client/game_sa/CBuildingsPoolSA.h

@@ -30,6 +30,7 @@ class CBuildingsPoolSA : public CBuildingsPool
     void RestoreBackup() override;
     bool Resize(int size) override;
     int  GetSize() const override { return (*m_ppBuildingPoolInterface)->m_nSize; };
+    CClientEntity* GetClientBuilding(CBuildingSAInterface* pGameInterface) const noexcept;
 
 private:
     void RemoveBuildingFromWorld(CBuildingSAInterface* pBuilding);

Client/game_sa/CHudSA.cpp

@@ -837,7 +837,7 @@ void __fastcall CHudSA::RenderWeaponIcon_Sprite(void* sprite, void*, CRect* rect
         color->a = properties.fillColorSecondary.a;
 
     // Call CSprite2d::Draw
-    ((void(__thiscall*)(void*, CRect*, RwColor*))FUNC_CSprie2d_Draw)(sprite, rect, color);
+    ((void(__thiscall*)(void*, CRect*, RwColor*))FUNC_CSprite2d_Draw)(sprite, rect, color);
 }
 
 void CHudSA::RenderWeaponIcon_XLU(CVector pos, CVector2D halfSize, std::uint8_t r, std::uint8_t g, std::uint8_t b, std::uint16_t intensity, float rhw, std::uint8_t a, std::uint8_t uDir, std::uint8_t vDir)

Client/game_sa/CHudSA.h

@@ -46,7 +46,7 @@
 
 #define FUNC_CStats_GetFatAndMuscleModifier 0x559AF0
 #define FUNC_CSprite2d_DrawBarChart         0x728640
-#define FUNC_CSprie2d_Draw                  0x728350
+#define FUNC_CSprite2d_Draw                  0x728350
 #define FUNC_CSprite_RenderOneXLUSprite     0x70D000
 
 #define CODE_ShowMoney              0x58F47D

Client/game_sa/CPedSA.cpp

@@ -259,14 +259,14 @@ void CPedSA::SetHealth(float fHealth)
     GetPedInterface()->fHealth = fHealth;
 }
 
-float CPedSA::GetArmor()
+float CPedSA::GetArmor() noexcept
 {
     return GetPedInterface()->fArmor;
 }
 
-void CPedSA::SetArmor(float fArmor)
+void CPedSA::SetArmor(float armor) noexcept
 {
-    GetPedInterface()->fArmor = fArmor;
+    GetPedInterface()->fArmor = armor;
 }
 
 float CPedSA::GetOxygenLevel()

Client/game_sa/CPedSA.h

@@ -313,8 +313,8 @@ class CPedSA : public virtual CPed, public virtual CPhysicalSA
     float GetHealth();
     void  SetHealth(float fHealth);
 
-    float GetArmor();
-    void  SetArmor(float fArmor);
+    float GetArmor() noexcept;
+    void  SetArmor(float armor) noexcept;
 
     float GetOxygenLevel();
     void  SetOxygenLevel(float fOxygen);

Client/game_sa/CPoolsSA.cpp

@@ -566,8 +566,12 @@ CClientEntity* CPoolsSA::GetClientEntity(DWORD* pGameInterface)
         {
             return pThePedEntity->pClientEntity;
         }
+
+        auto clientBuilding = m_BuildingsPool.GetClientBuilding(reinterpret_cast<CBuildingSAInterface*>(pGameInterface));
+        if (clientBuilding)
+            return clientBuilding;
     }
-    return NULL;
+    return nullptr;
 }
 
 static void CreateMissionTrain(const CVector& vecPos, bool bDirection, std::uint32_t uiTrainType, CTrainSAInterface** ppTrainBeginning,

Client/mods/deathmatch/logic/CClientBuilding.cpp

@@ -133,6 +133,11 @@ void CClientBuilding::Create()
 
     m_pBuilding = g_pGame->GetPools()->GetBuildingsPool().AddBuilding(this, m_usModelId, &m_vPos, &vRot4D, m_interior);
 
+    if (!m_pBuilding)
+        return;
+
+    m_pBuilding->SetBackfaceCulled(!m_bDoubleSided);
+
     if (!m_usesCollision)
     {
         m_pBuilding->SetUsesCollision(m_usesCollision);

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -3734,6 +3734,9 @@ void CClientGame::StaticGameEntityRenderHandler(CEntitySAInterface* pGameEntity)
                 case CCLIENTOBJECT:
                     iTypeMask = TYPE_MASK_OBJECT;
                     break;
+                case CCLIENTBUILDING:
+                    iTypeMask = TYPE_MASK_WORLD;
+                    break;
                 default:
                     iTypeMask = TYPE_MASK_OTHER;
                     break;
@@ -4368,7 +4371,7 @@ bool CClientGame::ApplyPedDamageFromGame(eWeaponType weaponUsed, float fDamage,
 {
     float fPreviousHealth = pDamagedPed->m_fHealth;
     float fCurrentHealth = pDamagedPed->GetGamePlayer()->GetHealth();
-    float fPreviousArmor = pDamagedPed->m_fArmor;
+    float fPreviousArmor = pDamagedPed->m_armor;
     float fCurrentArmor = pDamagedPed->GetGamePlayer()->GetArmor();
 
     // Have we taken any damage here?
@@ -4404,7 +4407,7 @@ bool CClientGame::ApplyPedDamageFromGame(eWeaponType weaponUsed, float fDamage,
             {
                 // Reget values in case they have been changed during onClientPlayerDamage event (Avoid AC#1 kick)
                 fPreviousHealth = pDamagedPed->m_fHealth;
-                fPreviousArmor = pDamagedPed->m_fArmor;
+                fPreviousArmor = pDamagedPed->m_armor;
             }
             pDamagedPed->GetGamePlayer()->SetHealth(fPreviousHealth);
             pDamagedPed->GetGamePlayer()->SetArmor(fPreviousArmor);
@@ -4450,7 +4453,7 @@ bool CClientGame::ApplyPedDamageFromGame(eWeaponType weaponUsed, float fDamage,
 
         // Update our stored health/armor
         pDamagedPed->m_fHealth = fCurrentHealth;
-        pDamagedPed->m_fArmor = fCurrentArmor;
+        pDamagedPed->m_armor = fCurrentArmor;
 
         ElementID damagerID = INVALID_ELEMENT_ID;
         if (pInflictingEntity && !pInflictingEntity->IsLocalEntity())

Client/mods/deathmatch/logic/CClientManager.cpp

@@ -218,6 +218,7 @@ void CClientManager::DoPulse(bool bDoStandardPulses, bool bDoVehicleManagerPulse
             m_pColManager->DoPulse();
             m_pGUIManager->DoPulse();
             m_pWeaponManager->DoPulse();
+            m_pRenderElementManager->DoPulse();
         }
         else
         {