New argument

Author: FileEX

Client/game_sa/CHeliSA.cpp

@@ -11,7 +11,7 @@
 #include "StdInc.h"
 #include "CHeliSA.h"
 
-CHeliSA::CHeliSA(CHeliSAInterface* pInterface) : m_rotorState(true)
+CHeliSA::CHeliSA(CHeliSAInterface* pInterface)
 {
     SetInterface(pInterface);
     Init();

Client/game_sa/CHeliSA.h

@@ -53,11 +53,4 @@ class CHeliSA final : public virtual CHeli, public virtual CAutomobileSA
 {
 public:
     CHeliSA(CHeliSAInterface* pInterface);
-
-    // Not SA
-    bool GetHeliRotorState() noexcept override { return m_rotorState; }
-    void SetHeliRotorState(bool state) noexcept override { m_rotorState = state; }
-
-private:
-    bool m_rotorState;
 };

Client/game_sa/CVehicleSA.cpp

@@ -58,11 +58,7 @@ bool CanProcessFlyingCarStuff(CHeliSAInterface* heliInterface)
     if (!vehicle || !vehicle->pEntity)
         return true;
 
-    auto* heli = reinterpret_cast<CHeliSA*>(vehicle->pEntity);
-    if (!heli)
-        return true;
-
-    return heli->GetHeliRotorState();
+    return vehicle->pEntity->GetHeliRotorState();
 }
 
 void _declspec(naked) HOOK_CHeli_ProcessFlyingCarStuff()
@@ -540,6 +536,14 @@ void CVehicleSA::SetHeliRotorSpeed(float speed)
     heliInterface->m_wheelSpeed[1] = speed;
 }
 
+void CVehicleSA::SetHeliRotorState(bool state, bool stopRotor) noexcept
+{
+    m_heliRotorState = state;
+
+    if (!state && stopRotor)
+        SetHeliRotorSpeed(0.0f);
+}
+
 void CVehicleSA::SetPlaneRotorSpeed(float fSpeed)
 {
     auto pInterface = static_cast<CPlaneSAInterface*>(GetInterface());

Client/game_sa/CVehicleSA.h

@@ -415,6 +415,7 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA
     unsigned char                    m_ucVariant2;
     unsigned char                    m_ucVariantCount{0};
     bool                             m_doorsUndamageable{false};
+    bool                             m_heliRotorState{true};
 
     std::array<CVector, VEHICLE_DUMMY_COUNT> m_dummyPositions;
 
@@ -546,6 +547,7 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA
     bool           GetTyresDontBurst() { return GetVehicleInterface()->m_nVehicleFlags.bTyresDontBurst; };
     unsigned short GetAdjustablePropertyValue() { return *reinterpret_cast<unsigned short*>(reinterpret_cast<unsigned long>(m_pInterface) + 2156); };
     float          GetHeliRotorSpeed();
+    bool           GetHeliRotorState() const noexcept override { return m_heliRotorState; }
     float          GetPlaneRotorSpeed();
 
     unsigned long  GetExplodeTime() { return *reinterpret_cast<unsigned long*>(reinterpret_cast<unsigned int>(m_pInterface) + 1240); };
@@ -572,6 +574,7 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA
         *reinterpret_cast<unsigned short*>(reinterpret_cast<unsigned int>(m_pInterface) + 2156) = usAdjustableProperty;
     };
     void SetHeliRotorSpeed(float speed);
+    void SetHeliRotorState(bool state, bool stopRotor) noexcept override;
     void SetPlaneRotorSpeed(float fSpeed);
     bool SetVehicleWheelRotation(float fWheelRot1, float fWheelRot2, float fWheelRot3, float fWheelRot4) noexcept;
     void SetExplodeTime(unsigned long ulTime) { *reinterpret_cast<unsigned long*>(reinterpret_cast<unsigned int>(m_pInterface) + 1240) = ulTime; };

Client/mods/deathmatch/logic/CClientVehicle.cpp

@@ -171,7 +171,6 @@ CClientVehicle::CClientVehicle(CClientManager* pManager, ElementID ID, unsigned
     m_fNitroLevel = 1.0f;
     m_cNitroCount = 0;
     m_fWheelScale = 1.0f;
-    m_heliRotorState = m_eVehicleType == CLIENTVEHICLE_HELI;
 
     for (unsigned int i = 0; i < MAX_WINDOWS; ++i)
     {
@@ -1578,30 +1577,15 @@ void CClientVehicle::SetHeliRotorSpeed(float fSpeed)
     m_fHeliRotorSpeed = fSpeed;
 }
 
-bool CClientVehicle::GetHeliRotorState()
+bool CClientVehicle::GetHeliRotorState() const noexcept
 {
-    if (m_pVehicle && m_eVehicleType == CLIENTVEHICLE_HELI)
-    {
-        auto* heli = reinterpret_cast<CHeli*>(m_pVehicle);
-        if (heli)
-            return heli->GetHeliRotorState();
-    }
-
-    return m_heliRotorState;
+    return m_pVehicle && m_eVehicleType == CLIENTVEHICLE_HELI ? m_pVehicle->GetHeliRotorState() : m_heliRotorState;
 }
 
-void CClientVehicle::SetHeliRotorState(bool state)
+void CClientVehicle::SetHeliRotorState(bool state, bool stopRotor) noexcept
 {
     if (m_pVehicle && m_eVehicleType == CLIENTVEHICLE_HELI)
-    {
-        auto* heli = reinterpret_cast<CHeli*>(m_pVehicle);
-        if (heli)
-        {
-            heli->SetHeliRotorState(state);
-            if (!state)
-                heli->SetHeliRotorSpeed(0.0f);
-        }
-    }
+        m_pVehicle->SetHeliRotorState(state, stopRotor);
 
     m_heliRotorState = state;
 }

Client/mods/deathmatch/logic/CClientVehicle.h

@@ -299,12 +299,12 @@ class CClientVehicle : public CClientStreamElement
     // TODO: Make the class remember on virtualization
     float GetHeliRotorSpeed();
     float GetPlaneRotorSpeed();
-    bool  GetHeliRotorState();
+    bool  GetHeliRotorState() const noexcept;
 
     bool GetRotorSpeed(float&);
     bool SetRotorSpeed(float);
     bool SetWheelsRotation(float fRot1, float fRot2, float fRot3, float fRot4) noexcept;
-    void SetHeliRotorState(bool state);
+    void SetHeliRotorState(bool state, bool stopRotor) noexcept;
     void SetHeliRotorSpeed(float fSpeed);
     void SetPlaneRotorSpeed(float fSpeed);
     bool IsHeliSearchLightVisible();
@@ -673,7 +673,7 @@ class CClientVehicle : public CClientStreamElement
     uchar m_ucTrackID;
     bool  m_bJustStreamedIn;
     bool  m_bWheelScaleChanged;
-    bool  m_heliRotorState;
+    bool  m_heliRotorState{true};
 
     // Time dependent error compensation interpolation
     struct

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

@@ -4279,12 +4279,12 @@ std::variant<bool, std::array<CVector, 4>> CLuaVehicleDefs::OOP_GetVehicleEntryP
     return entryPoints;
 }
 
-bool CLuaVehicleDefs::SetHeliRotorState(CClientVehicle* vehicle, bool state)
+bool CLuaVehicleDefs::SetHeliRotorState(CClientVehicle* vehicle, bool state, std::optional<bool> stopRotor)
 {
     if (vehicle->GetVehicleType() != eClientVehicleType::CLIENTVEHICLE_HELI)
         return false;
 
-    vehicle->SetHeliRotorState(state);
+    vehicle->SetHeliRotorState(state, stopRotor.value_or(true));
     return true;
 }
 

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

@@ -166,7 +166,7 @@ class CLuaVehicleDefs : public CLuaDefs
     static bool SetVehicleModelWheelSize(const unsigned short usModel, const eResizableVehicleWheelGroup eWheelGroup, const float fWheelSize);
     static int  GetVehicleWheelFrictionState(CClientVehicle* pVehicle, unsigned char wheel);
 
-    static bool SetHeliRotorState(CClientVehicle* const vehicle, bool state);
+    static bool SetHeliRotorState(CClientVehicle* const vehicle, bool state, std::optional<bool> stopRotor);
     static bool GetHeliRotorState(CClientVehicle* const vehicle);
 
     // Components

Client/sdk/game/CHeli.h

@@ -16,7 +16,4 @@ class CHeli : public virtual CAutomobile
 {
 public:
     virtual ~CHeli(){};
-
-    virtual void SetHeliRotorState(bool state) = 0;
-    virtual bool GetHeliRotorState() = 0;
 };

Client/sdk/game/CVehicle.h

@@ -199,6 +199,7 @@ class CVehicle : public virtual CPhysical
     virtual bool           GetTyresDontBurst() = 0;
     virtual unsigned short GetAdjustablePropertyValue() = 0;
     virtual float          GetHeliRotorSpeed() = 0;
+    virtual bool           GetHeliRotorState() const noexcept = 0;
     virtual float          GetPlaneRotorSpeed() = 0;
     virtual unsigned long  GetExplodeTime() = 0;
 
@@ -220,6 +221,7 @@ class CVehicle : public virtual CPhysical
     virtual void SetTyresDontBurst(bool bTyresDontBurst) = 0;
     virtual void SetAdjustablePropertyValue(unsigned short usAdjustableProperty) = 0;
     virtual void SetHeliRotorSpeed(float fSpeed) = 0;
+    virtual void SetHeliRotorState(bool state, bool stopRotor) noexcept = 0;
     virtual void SetPlaneRotorSpeed(float fSpeed) = 0;
     virtual bool SetVehicleWheelRotation(float fRot1, float fRot2, float fRot3, float fRot4) noexcept = 0;
     virtual void SetTaxiLightOn(bool bLightState) = 0;