Update damageable logic to be set through SetVehicleDamageProof

Author: MegadreamsBE

Client/mods/deathmatch/logic/CClientVehicle.cpp

@@ -35,7 +35,7 @@ std::set<const CClientEntity*> ms_AttachedVehiclesToIgnore;
 #define VEHICLE_INTERPOLATION_WARP_THRESHOLD            15
 #define VEHICLE_INTERPOLATION_WARP_THRESHOLD_FOR_SPEED  10
 
-CClientVehicle::CClientVehicle(CClientManager* pManager, ElementID ID, unsigned short usModel, unsigned char ucVariation, unsigned char ucVariation2, bool damageable)
+CClientVehicle::CClientVehicle(CClientManager* pManager, ElementID ID, unsigned short usModel, unsigned char ucVariation, unsigned char ucVariation2)
     : ClassInit(this), CClientStreamElement(pManager->GetVehicleStreamer(), ID)
 {
     CClientEntityRefManager::AddEntityRefs(ENTITY_REF_DEBUG(this, "CClientVehicle"), &m_pDriver, &m_pOccupyingDriver, &m_pPreviousLink, &m_pNextLink,
@@ -135,9 +135,8 @@ CClientVehicle::CClientVehicle(CClientManager* pManager, ElementID ID, unsigned
     memset(&m_ucLightStates[0], 0, sizeof(m_ucLightStates));
     m_bCanBeDamaged = true;
     m_bSyncUnoccupiedDamage = false;
-    m_bScriptCanBeDamaged = true;
+    m_bScriptCanBeDamaged = !IsLocalEntity();
     m_bTyresCanBurst = true;
-    m_localCanBeDamaged = damageable;
     m_ucOverrideLights = 0;
     m_pTowedVehicle = NULL;
     m_pTowedByVehicle = NULL;
@@ -1178,7 +1177,7 @@ void CClientVehicle::CalcAndUpdateCanBeDamagedFlag()
         bCanBeDamaged = true;
 
     if (IsLocalEntity())
-        bCanBeDamaged = m_localCanBeDamaged;
+        bCanBeDamaged = m_bScriptCanBeDamaged;
 
     // Script override
     if (!m_bScriptCanBeDamaged)
@@ -1223,7 +1222,7 @@ void CClientVehicle::CalcAndUpdateTyresCanBurstFlag()
         bTyresCanBurst = true;
 
     if (IsLocalEntity())
-        bTyresCanBurst = m_localCanBeDamaged;
+        bTyresCanBurst = m_bScriptCanBeDamaged;
 
     // Script override
     if (!m_bScriptCanBeDamaged)

Client/mods/deathmatch/logic/CClientVehicle.h

@@ -160,7 +160,7 @@ class CClientVehicle : public CClientStreamElement
 
 protected:            // Use CDeathmatchVehicle constructor for now. Will get removed later when this class is
                       // cleaned up.
-    CClientVehicle(CClientManager* pManager, ElementID ID, unsigned short usModel, unsigned char ucVariation, unsigned char ucVariation2, bool damageable = false);
+    CClientVehicle(CClientManager* pManager, ElementID ID, unsigned short usModel, unsigned char ucVariation, unsigned char ucVariation2);
 
 public:
     ~CClientVehicle();
@@ -627,7 +627,6 @@ class CClientVehicle : public CClientStreamElement
     bool                                   m_bCanBeDamaged;
     bool                                   m_bScriptCanBeDamaged;
     bool                                   m_bSyncUnoccupiedDamage;
-    bool                                   m_localCanBeDamaged{false};
     bool                                   m_bTyresCanBurst;
     SFixedArray<unsigned char, MAX_DOORS>  m_ucDoorStates;
     SFixedArray<unsigned char, MAX_WHEELS> m_ucWheelStates;

Client/mods/deathmatch/logic/CDeathmatchVehicle.cpp

@@ -13,8 +13,8 @@
 #include "net/SyncStructures.h"
 
 CDeathmatchVehicle::CDeathmatchVehicle(CClientManager* pManager, CUnoccupiedVehicleSync* pUnoccupiedVehicleSync, ElementID ID, unsigned short usVehicleModel,
-                                       unsigned char ucVariant, unsigned char ucVariant2, bool damageable)
-    : ClassInit(this), CClientVehicle(pManager, ID, usVehicleModel, ucVariant, ucVariant2, damageable)
+                                       unsigned char ucVariant, unsigned char ucVariant2)
+    : ClassInit(this), CClientVehicle(pManager, ID, usVehicleModel, ucVariant, ucVariant2)
 {
     m_pUnoccupiedVehicleSync = pUnoccupiedVehicleSync;
     GetInitialDoorStates(m_ucLastDoorStates);

Client/mods/deathmatch/logic/CDeathmatchVehicle.h

@@ -18,7 +18,7 @@ class CDeathmatchVehicle final : public CClientVehicle
     DECLARE_CLASS(CDeathmatchVehicle, CClientVehicle)
 public:
     CDeathmatchVehicle(CClientManager* pManager, class CUnoccupiedVehicleSync* pUnoccupiedVehicleSync, ElementID ID, unsigned short usVehicleModel,
-                       unsigned char ucVariant, unsigned char ucVariant2, bool damageable = false);
+                       unsigned char ucVariant, unsigned char ucVariant2);
     ~CDeathmatchVehicle();
 
     bool IsSyncing() { return m_bIsSyncing; };

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -2858,7 +2858,7 @@ bool CStaticFunctionDefinitions::IsTrainChainEngine(CClientVehicle& Vehicle, boo
 }
 
 CClientVehicle* CStaticFunctionDefinitions::CreateVehicle(CResource& Resource, unsigned short usModel, const CVector& vecPosition, const CVector& vecRotation,
-                                                          const char* szRegPlate, unsigned char ucVariant, unsigned char ucVariant2, bool damageable)
+                                                          const char* szRegPlate, unsigned char ucVariant, unsigned char ucVariant2)
 {
     if (CClientVehicleManager::IsValidModel(usModel) && (ucVariant <= 5 || ucVariant == 255) && (ucVariant2 <= 5 || ucVariant2 == 255))
     {
@@ -2867,7 +2867,7 @@ CClientVehicle* CStaticFunctionDefinitions::CreateVehicle(CResource& Resource, u
         if (ucVariant2 == 255 && ucVariant == 255)
             CClientVehicleManager::GetRandomVariation(usModel, ucVariation, ucVariation2);
 
-        CClientVehicle* pVehicle = new CDeathmatchVehicle(m_pManager, NULL, INVALID_ELEMENT_ID, usModel, ucVariation, ucVariation2, damageable);
+        CClientVehicle* pVehicle = new CDeathmatchVehicle(m_pManager, NULL, INVALID_ELEMENT_ID, usModel, ucVariation, ucVariation2);
 
         pVehicle->SetParent(Resource.GetResourceDynamicEntity());
         pVehicle->SetPosition(vecPosition);

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -202,7 +202,7 @@ class CStaticFunctionDefinitions
 
     // Vehicle get funcs
     static CClientVehicle* CreateVehicle(CResource& Resource, unsigned short usModel, const CVector& vecPosition, const CVector& vecRotation,
-                                         const char* szRegPlate = NULL, unsigned char ucVariant = 5, unsigned char ucVariant2 = 5, bool damageable = false);
+                                         const char* szRegPlate = NULL, unsigned char ucVariant = 5, unsigned char ucVariant2 = 5);
     static bool            GetVehicleModelFromName(const char* szName, unsigned short& usModel);
     static bool            GetVehicleUpgradeSlotName(unsigned char ucSlot, SString& strOutName);
     static bool            GetVehicleUpgradeSlotName(unsigned short usUpgrade, SString& strOutName);

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

@@ -1532,15 +1532,13 @@ int CLuaVehicleDefs::CreateVehicle(lua_State* luaVM)
     unsigned char    ucVariant = 255;
     unsigned char    ucVariant2 = 255;
     SString          strRegPlate = "";
-    bool             damageable = false;
     CScriptArgReader argStream(luaVM);
     argStream.ReadNumber(usModel);
     argStream.ReadVector3D(vecPosition);
     argStream.ReadVector3D(vecRotation, vecRotation);
     argStream.ReadString(strRegPlate, "");
     argStream.ReadNumber(ucVariant, 255);
     argStream.ReadNumber(ucVariant2, 255);
-    argStream.ReadBool(damageable, false);
 
     if (!argStream.HasErrors())
     {
@@ -1552,8 +1550,7 @@ int CLuaVehicleDefs::CreateVehicle(lua_State* luaVM)
             {
                 // Create the vehicle and return its handle
                 CClientVehicle* pVehicle = CStaticFunctionDefinitions::CreateVehicle(*pResource, usModel, vecPosition, vecRotation,
-                                                                                     strRegPlate == "" ? NULL : strRegPlate.c_str(), ucVariant, ucVariant2,
-                                                                                     damageable);
+                                                                                     strRegPlate == "" ? NULL : strRegPlate.c_str(), ucVariant, ucVariant2);
                 if (pVehicle)
                 {
                     CElementGroup* pGroup = pResource->GetElementGroup();