From 015ace2cb7c04545767aab241f33100a279f61dd Mon Sep 17 00:00:00 2001 From: Tracer <43095317+TracerDS@users.noreply.github.com> Date: Tue, 27 Aug 2024 21:50:47 +0200 Subject: [PATCH 1/2] Update CHeliSA.h --- Client/game_sa/CHeliSA.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/Client/game_sa/CHeliSA.h b/Client/game_sa/CHeliSA.h index 49fc0d866d..1024b9b303 100644 --- a/Client/game_sa/CHeliSA.h +++ b/Client/game_sa/CHeliSA.h @@ -15,10 +15,48 @@ class CHeliSAInterface : public CAutomobileSAInterface { +public: + std::uint8_t m_heliFlags; + + std::uint8_t _pad1[3]; + std::uint32_t m_leftRightSkid; + std::uint32_t m_steeringUpDown; + std::uint32_t m_steeringLeftRight; + std::uint32_t m_accelerationBreakStatus; + std::uint32_t field_99C; + std::uint32_t m_rotorZ; + std::uint32_t m_secondRotorZ; + std::uint32_t m_maxAltitude; + std::uint32_t field_9AC; + std::uint32_t m_minAltitude; + std::uint32_t field_9B4; + std::uint8_t field_9B8; + std::uint8_t m_numSwatOccupants; + std::uint8_t m_swatIDs[4]; + + std::uint8_t _pad2[2]; + std::uint32_t field_9C0[4]; + std::uint32_t field_9D0; + + std::uint32_t m_particlesList; + std::uint8_t field_9D8[24]; + std::uint32_t field_9F0; + CVector m_searchLightTarget; + std::uint32_t m_searchLightIntensity; + std::uint32_t field_A04; + std::uint32_t field_A08; + std::uint32_t m_gunflashFx; + std::uint8_t m_firingMultiplier; + std::uint8_t m_searchLightEnabled; + std::uint8_t _pad3[2]; + std::uint32_t field_A14; }; +static_assert(sizeof(CHeliSAInterface) == 0xA18, "Invalid size for CHeliSAInterface"); class CHeliSA final : public virtual CHeli, public virtual CAutomobileSA { public: CHeliSA(CHeliSAInterface* pInterface); + CHeliSAInterface* GetHeliInterface() noexcept { return reinterpret_cast(GetInterface()); } + //const CHeliSAInterface* GetHeliInterface() const noexcept { return reinterpret_cast(GetInterface()); } }; From c6d32f55657518a31f42bcaf884e46fd30178f3d Mon Sep 17 00:00:00 2001 From: Tracer <43095317+TracerDS@users.noreply.github.com> Date: Wed, 28 Aug 2024 10:32:12 +0200 Subject: [PATCH 2/2] Update CHeliSA.h --- Client/game_sa/CHeliSA.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Client/game_sa/CHeliSA.h b/Client/game_sa/CHeliSA.h index 1024b9b303..497fe46a70 100644 --- a/Client/game_sa/CHeliSA.h +++ b/Client/game_sa/CHeliSA.h @@ -57,6 +57,5 @@ class CHeliSA final : public virtual CHeli, public virtual CAutomobileSA { public: CHeliSA(CHeliSAInterface* pInterface); - CHeliSAInterface* GetHeliInterface() noexcept { return reinterpret_cast(GetInterface()); } - //const CHeliSAInterface* GetHeliInterface() const noexcept { return reinterpret_cast(GetInterface()); } + CHeliSAInterface* GetHeliInterface() noexcept { return reinterpret_cast(GetInterface()); } };