Review

Author: FileEX

Client/game_sa/CVehicleSA.cpp

@@ -524,16 +524,14 @@ void CVehicleSA::SetTrainSpeed(float fSpeed)
     pInterface->m_fTrainSpeed = fSpeed;
 }
 
-float CVehicleSA::GetHeliRotorSpeed()
+float CVehicleSA::GetHeliRotorSpeed() const
 {
-    auto* heliInterface = static_cast<CHeliSAInterface*>(GetInterface());
-    return heliInterface->m_wheelSpeed[1];
+    return static_cast<CHeliSAInterface*>(m_pInterface)->m_wheelSpeed[1];
 }
 
 void CVehicleSA::SetHeliRotorSpeed(float speed)
 {
-    auto* heliInterface = static_cast<CHeliSAInterface*>(GetInterface());
-    heliInterface->m_wheelSpeed[1] = speed;
+    static_cast<CHeliSAInterface*>(GetInterface())->m_wheelSpeed[1] = speed;
 }
 
 void CVehicleSA::SetHeliRotorState(bool state, bool stopRotor) noexcept

Client/game_sa/CVehicleSA.h

@@ -546,7 +546,7 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA
     bool           GetTakeLessDamage() { return GetVehicleInterface()->m_nVehicleFlags.bTakeLessDamage; };
     bool           GetTyresDontBurst() { return GetVehicleInterface()->m_nVehicleFlags.bTyresDontBurst; };
     unsigned short GetAdjustablePropertyValue() { return *reinterpret_cast<unsigned short*>(reinterpret_cast<unsigned long>(m_pInterface) + 2156); };
-    float          GetHeliRotorSpeed();
+    float          GetHeliRotorSpeed() const;
     bool           GetHeliRotorState() const noexcept override { return m_heliRotorState; }
     float          GetPlaneRotorSpeed();
 

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

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

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

@@ -166,8 +166,8 @@ 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, std::optional<bool> stopRotor);
-    static bool GetHeliRotorState(CClientVehicle* const vehicle);
+    static bool SetHeliRotorState(CClientVehicle* const vehicle, bool state, std::optional<bool> stopRotor) noexcept;
+    static bool GetHeliRotorState(CClientVehicle* const vehicle) noexcept;
 
     // Components
     LUA_DECLARE(SetVehicleComponentPosition);

Client/sdk/game/CVehicle.h

@@ -198,7 +198,7 @@ class CVehicle : public virtual CPhysical
     virtual bool           GetTakeLessDamage() = 0;
     virtual bool           GetTyresDontBurst() = 0;
     virtual unsigned short GetAdjustablePropertyValue() = 0;
-    virtual float          GetHeliRotorSpeed() = 0;
+    virtual float          GetHeliRotorSpeed() const = 0;
     virtual bool           GetHeliRotorState() const noexcept = 0;
     virtual float          GetPlaneRotorSpeed() = 0;
     virtual unsigned long  GetExplodeTime() = 0;