Added new functions get/setObjectProperty

Client/game_sa/CPhysicalSA.cpp

@@ -135,6 +135,16 @@ void CPhysicalSA::SetTurnMass(float fTurnMass)
     ((CPhysicalSAInterface*)this->GetInterface())->m_fTurnMass = fTurnMass;
 }
 
+float CPhysicalSA::GetAirResistance(void)
+{
+    return ((CPhysicalSAInterface*)this->GetInterface())->m_fAirResistance;
+}
+
+void CPhysicalSA::SetAirResistance(float fAirResistance)
+{
+    ((CPhysicalSAInterface*)this->GetInterface())->m_fAirResistance = fAirResistance;
+}
+
 float CPhysicalSA::GetElasticity(void)
 {
     return ((CPhysicalSAInterface*)this->GetInterface())->m_fElasticity;
@@ -155,6 +165,17 @@ void CPhysicalSA::SetBuoyancyConstant(float fBuoyancyConstant)
     ((CPhysicalSAInterface*)this->GetInterface())->m_fBuoyancyConstant = fBuoyancyConstant;
 }
 
+void CPhysicalSA::GetCenterOfMass(CVector & vecCenterOfMass)
+{
+    vecCenterOfMass = ((CPhysicalSAInterface*)this->GetInterface())->m_vecCenterOfMass;
+}
+
+
+void CPhysicalSA::SetCenterOfMass(CVector & vecCenterOfMass)
+{
+    ((CPhysicalSAInterface*)this->GetInterface())->m_vecCenterOfMass = vecCenterOfMass;
+}
+
 VOID CPhysicalSA::ProcessCollision()
 {
     DEBUG_TRACE("VOID CPhysicalSA::ProcessCollision()");

Client/game_sa/CPhysicalSA.h

@@ -9,8 +9,7 @@
  *
  *****************************************************************************/
 
-#ifndef __CGAMESA_PHYSICAL
-#define __CGAMESA_PHYSICAL
+#pragma once
 
 #include <game/CPhysical.h>
 #include "CEntitySA.h"
@@ -125,10 +124,14 @@ class CPhysicalSA : public virtual CPhysical, public virtual CEntitySA
     void  SetMass(float fMass);
     float GetTurnMass(void);
     void  SetTurnMass(float fTurnMass);
+    float GetAirResistance(void);
+    void  SetAirResistance(float fAirResistance);
     float GetElasticity(void);
     void  SetElasticity(float fElasticity);
     float GetBuoyancyConstant(void);
     void  SetBuoyancyConstant(float fBuoyancyConstant);
+    void  GetCenterOfMass(CVector& vecCenterOfMass);
+    void  SetCenterOfMass(CVector& vecCenterOfMass);
 
     void ProcessCollision(void);
     void AddToMovingList(void);
@@ -155,10 +158,6 @@ class CPhysicalSA : public virtual CPhysical, public virtual CEntitySA
     /*
     VOID        SetMassMultiplier(FLOAT fMassMultiplier);
     FLOAT       GetMassMultiplier();
-    VOID        SetAirResistance(FLOAT fAirResistance);
-    FLOAT       GetAirResistance();
-    VOID        SetCenterOfMass(CVector * vecCenterOfMass);
-    CVector * GetCenterOfMass();
 
     BOOL        GetExtraHeavy();
     VOID        SetExtraHeavy(BOOL bExtraHeavy);
@@ -173,5 +172,3 @@ class CPhysicalSA : public virtual CPhysical, public virtual CEntitySA
     BYTE        GetLevel();
     VOID        SetLevel(BYTE LivesInThisLevel);*/
 };
-
-#endif

Client/mods/deathmatch/logic/CClientObject.cpp

@@ -40,6 +40,11 @@ CClientObject::CClientObject(CClientManager* pManager, ElementID ID, unsigned sh
     m_bBreakingDisabled = false;
     m_bRespawnEnabled = true;
     m_fMass = -1.0f;
+    m_fTurnMass = -1.0f;
+    m_fAirResistance = -1.0f;
+    m_fElasticity = -1.0f;
+    m_fBuoyancyConstant = -1.0f;
+    m_vecCenterOfMass = CVector(0.0f, 0.0f, 0.0f);
 
     m_pModelInfo = g_pGame->GetModelInfo(usModel);
 
@@ -511,10 +516,20 @@ void CClientObject::Create(void)
                 SetAlpha(m_ucAlpha);
                 m_pObject->SetHealth(m_fHealth);
 
-                // Set object mass
+                // Set object properties
                 if (m_fMass != -1.0f)
                     m_pObject->SetMass(m_fMass);
-
+                if (m_fTurnMass != -1.0f)
+                    m_pObject->SetTurnMass(m_fTurnMass);
+                if (m_fAirResistance != -1.0f)
+                    m_pObject->SetAirResistance(m_fAirResistance);
+                if (m_fElasticity != -1.0f)
+                    m_pObject->SetElasticity(m_fElasticity);
+                if (m_fBuoyancyConstant != -1.0f)
+                    m_pObject->SetBuoyancyConstant(m_fBuoyancyConstant);
+                if (m_vecCenterOfMass.fX != 0.0f || m_vecCenterOfMass.fY != 0.0f || m_vecCenterOfMass.fZ != 0.0f)
+                    m_pObject->SetCenterOfMass(m_vecCenterOfMass);
+
                 // Reattach to an entity + any entities attached to this
                 ReattachEntities();
 
@@ -730,6 +745,86 @@ void CClientObject::SetMass(float fMass)
     m_fMass = fMass;
 }
 
+float CClientObject::GetTurnMass(void)
+{
+    if (m_pObject)
+        return m_pObject->GetTurnMass();
+
+    return m_fTurnMass;
+}
+
+void CClientObject::SetTurnMass(float fTurnMass)
+{
+    if (m_pObject)
+        m_pObject->SetTurnMass(fTurnMass);
+
+    m_fTurnMass = fTurnMass;
+}
+
+float CClientObject::GetAirResistance(void)
+{
+    if (m_pObject)
+        return m_pObject->GetAirResistance();
+
+    return m_fAirResistance;
+}
+
+void CClientObject::SetAirResistance(float fAirResistance)
+{
+    if (m_pObject)
+        m_pObject->SetAirResistance(fAirResistance);
+
+    m_fAirResistance = fAirResistance;
+}
+
+float CClientObject::GetElasticity(void)
+{
+    if (m_pObject)
+        return m_pObject->GetElasticity();
+
+    return m_fElasticity;
+}
+
+void CClientObject::SetElasticity(float fElasticity)
+{
+    if (m_pObject)
+        m_pObject->SetElasticity(fElasticity);
+
+    m_fElasticity = fElasticity;
+}
+
+float CClientObject::GetBuoyancyConstant(void)
+{
+    if (m_pObject)
+        return m_pObject->GetBuoyancyConstant();
+
+    return m_fBuoyancyConstant;
+}
+
+void CClientObject::SetBuoyancyConstant(float fBuoyancyConstant)
+{
+    if (m_pObject)
+        m_pObject->SetBuoyancyConstant(fBuoyancyConstant);
+
+    m_fBuoyancyConstant = fBuoyancyConstant;
+}
+
+void CClientObject::GetCenterOfMass(CVector& vecCenterOfMass) const
+{
+    if (m_pObject)
+        m_pObject->GetCenterOfMass(vecCenterOfMass);
+    else
+        vecCenterOfMass = m_vecCenterOfMass;
+}
+
+void CClientObject::SetCenterOfMass(const CVector& vecCenterOfMass)
+{
+    if (m_pObject)
+        m_pObject->SetCenterOfMass(const_cast<CVector&>(vecCenterOfMass));
+
+    m_vecCenterOfMass = vecCenterOfMass;
+}
+
 void CClientObject::SetVisibleInAllDimensions(bool bVisible, unsigned short usNewDimension)
 {
     m_bVisibleInAllDimensions = bVisible;

Client/mods/deathmatch/logic/CClientObject.h

@@ -87,6 +87,16 @@ class CClientObject : public CClientStreamElement
 
     float GetHealth(void);
     void  SetHealth(float fHealth);
+    float GetTurnMass(void);
+    void  SetTurnMass(float fTurnMass);
+    float GetAirResistance(void);
+    void  SetAirResistance(float fAirResistance);
+    float GetElasticity(void);
+    void  SetElasticity(float fElasticity);
+    float GetBuoyancyConstant(void);
+    void  SetBuoyancyConstant(float fBuoyancyConstant);
+    void  GetCenterOfMass(CVector& vecCenterOfMass) const;
+    void  SetCenterOfMass(const CVector& vecCenterOfMass);
 
     bool IsBreakable(bool bCheckModelList = true);
     bool SetBreakable(bool bBreakable);
@@ -135,6 +145,11 @@ class CClientObject : public CClientStreamElement
     bool          m_bBeingRespawned;
     bool          m_bRespawnEnabled;
     float         m_fMass;
+    float         m_fTurnMass;
+    float         m_fAirResistance;
+    float         m_fElasticity;
+    float         m_fBuoyancyConstant;
+    CVector       m_vecCenterOfMass;
     bool          m_bVisibleInAllDimensions = false;
 
     CVector m_vecMoveSpeed;

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -1081,7 +1081,6 @@ bool CStaticFunctionDefinitions::SetElementRotation(CClientEntity& Entity, const
             {
                 Vehicle.SetRotationDegrees(ConvertEulerRotationOrder(vecRotation, argumentRotOrder, EULER_ZYX));
             }
-
             break;
         }
         case CCLIENTOBJECT:
@@ -3765,6 +3764,36 @@ bool CStaticFunctionDefinitions::GetObjectMass(CClientObject& Object, float& fMa
     return true;
 }
 
+bool CStaticFunctionDefinitions::GetObjectTurnMass(CClientObject& Object, float& fTurnMass)
+{
+    fTurnMass = Object.GetTurnMass();
+    return true;
+}
+
+bool CStaticFunctionDefinitions::GetObjectAirResistance(CClientObject& Object, float& fAirResistance)
+{
+    fAirResistance = Object.GetAirResistance();
+    return true;
+}
+
+bool CStaticFunctionDefinitions::GetObjectElasticity(CClientObject& Object, float& fElasticity)
+{
+    fElasticity = Object.GetElasticity();
+    return true;
+}
+
+bool CStaticFunctionDefinitions::GetObjectBuoyancyConstant(CClientObject& Object, float& fBuoyancyConstant)
+{
+    fBuoyancyConstant = Object.GetBuoyancyConstant();
+    return true;
+}
+
+bool CStaticFunctionDefinitions::GetObjectCenterOfMass(CClientObject& Object, CVector& vecCenterOfMass)
+{
+    Object.GetCenterOfMass(vecCenterOfMass);
+    return true;
+}
+
 bool CStaticFunctionDefinitions::SetObjectRotation(CClientEntity& Entity, const CVector& vecRotation)
 {
     RUN_CHILDREN(SetObjectRotation(**iter, vecRotation))
@@ -3935,6 +3964,75 @@ bool CStaticFunctionDefinitions::SetObjectMass(CClientEntity& Entity, float fMas
     return false;
 }
 
+bool CStaticFunctionDefinitions::SetObjectTurnMass(CClientEntity& Entity, float fTurnMass)
+{
+    if (fTurnMass >= 0.0f)
+    {
+        RUN_CHILDREN(SetObjectTurnMass(**iter, fTurnMass))
+
+        if (IS_OBJECT(&Entity))
+        {
+            CDeathmatchObject& Object = static_cast<CDeathmatchObject&>(Entity);
+            Object.SetTurnMass(fTurnMass);
+            return true;
+        }
+    }
+    return false;
+}
+
+bool CStaticFunctionDefinitions::SetObjectAirResistance(CClientEntity& Entity, float fAirResistance)
+{
+    RUN_CHILDREN(SetObjectAirResistance(**iter, fAirResistance))
+
+    if (IS_OBJECT(&Entity))
+    {
+        CDeathmatchObject& Object = static_cast<CDeathmatchObject&>(Entity);
+        Object.SetAirResistance(fAirResistance);
+        return true;
+    }
+    return false;
+}
+
+bool CStaticFunctionDefinitions::SetObjectElasticity(CClientEntity& Entity, float fElasticity)
+{
+    RUN_CHILDREN(SetObjectElasticity(**iter, fElasticity))
+
+    if (IS_OBJECT(&Entity))
+    {
+        CDeathmatchObject& Object = static_cast<CDeathmatchObject&>(Entity);
+        Object.SetElasticity(fElasticity);
+        return true;
+    }
+    return false;
+}
+
+bool CStaticFunctionDefinitions::SetObjectBuoyancyConstant(CClientEntity& Entity, float fBuoyancyConstant)
+{
+    RUN_CHILDREN(SetObjectBuoyancyConstant(**iter, fBuoyancyConstant))
+
+    if (IS_OBJECT(&Entity))
+    {
+        CDeathmatchObject& Object = static_cast<CDeathmatchObject&>(Entity);
+        Object.SetBuoyancyConstant(fBuoyancyConstant);
+        return true;
+    }
+    return false;
+}
+
+bool CStaticFunctionDefinitions::SetObjectCenterOfMass(CClientEntity& Entity, const CVector& vecCenterOfMass)
+{
+    RUN_CHILDREN(SetObjectCenterOfMass(**iter, vecCenterOfMass))
+
+    if (IS_OBJECT(&Entity))
+    {
+        CDeathmatchObject& Object = static_cast<CDeathmatchObject&>(Entity);
+        Object.SetCenterOfMass(vecCenterOfMass);
+        return true;
+    }
+
+    return false;
+}
+
 bool CStaticFunctionDefinitions::SetObjectVisibleInAllDimensions(CClientEntity& Entity, bool bVisible, unsigned short usNewDimension)
 {
     RUN_CHILDREN(SetObjectVisibleInAllDimensions(**iter, bVisible, usNewDimension))

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -274,6 +274,11 @@ class CStaticFunctionDefinitions
     static bool           GetObjectScale(CClientObject& Object, CVector& vecScale);
     static bool           IsObjectBreakable(CClientObject& Object, bool& bBreakable);
     static bool           GetObjectMass(CClientObject& Object, float& fMass);
+    static bool           GetObjectTurnMass(CClientObject& Object, float& fTurnMass);
+    static bool           GetObjectAirResistance(CClientObject& Object, float& fAirResistance);
+    static bool           GetObjectElasticity(CClientObject& Object, float& fElasticity);
+    static bool           GetObjectBuoyancyConstant(CClientObject& Object, float& fBuoyancyConstant);
+    static bool           GetObjectCenterOfMass(CClientObject& Object, CVector& vecCenterOfMass);
     static bool           IsObjectVisibleInAllDimensions(CClientEntity& Entity);
 
     // Object set funcs
@@ -288,6 +293,11 @@ class CStaticFunctionDefinitions
     static bool RespawnObject(CClientEntity& Entity);
     static bool ToggleObjectRespawn(CClientEntity& Entity, bool bRespawn);
     static bool SetObjectMass(CClientEntity& Entity, float fMass);
+    static bool SetObjectTurnMass(CClientEntity& Entity, float fTurnMass);
+    static bool SetObjectAirResistance(CClientEntity& Entity, float fAirResistance);
+    static bool SetObjectElasticity(CClientEntity& Entity, float fElasticity);
+    static bool SetObjectBuoyancyConstant(CClientEntity& Entity, float fBuoyancyConstant);
+    static bool SetObjectCenterOfMass(CClientEntity& Entity, const CVector& vecCenterOfMass);
     static bool SetObjectVisibleInAllDimensions(CClientEntity& Entity, bool bVisible, unsigned short usNewDimension = 0);
 
     // Radar-area get funcs

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

@@ -370,6 +370,16 @@ ADD_ENUM(VEHICLE_COMPONENT_EXTRA_1, "extra_1")
 ADD_ENUM(VEHICLE_COMPONENT_EXTRA_2, "extra_2")
 IMPLEMENT_ENUM_END("vehicle-component")
 
+IMPLEMENT_ENUM_BEGIN(eObjectProperty)
+ADD_ENUM(OBJECT_PROPERTY_ALL, "all")
+ADD_ENUM(OBJECT_PROPERTY_MASS, "mass")
+ADD_ENUM(OBJECT_PROPERTY_TURNMASS, "turn_mass")
+ADD_ENUM(OBJECT_PROPERTY_AIRRESISTANCE, "air_resistance")
+ADD_ENUM(OBJECT_PROPERTY_ELASTICITY, "elasticity")
+ADD_ENUM(OBJECT_PROPERTY_CENTEROFMASS, "center_of_mass")
+ADD_ENUM(OBJECT_PROPERTY_BUOYANCY, "buoyancy")
+IMPLEMENT_ENUM_END("object-property")
+
 IMPLEMENT_ENUM_BEGIN(eFontType)
 ADD_ENUM(FONT_DEFAULT, "default")
 ADD_ENUM(FONT_DEFAULT_BOLD, "default-bold")

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h

@@ -39,6 +39,7 @@ DECLARE_ENUM(EEntityTypeMask);
 DECLARE_ENUM(eWeaponState);
 DECLARE_ENUM(eWeaponFlags);
 DECLARE_ENUM(eVehicleComponent);
+DECLARE_ENUM(eObjectProperty);
 DECLARE_ENUM(eFontType);
 DECLARE_ENUM(eFontQuality);
 DECLARE_ENUM(eAudioLookupIndex);