diff options
| author | aap <aap@papnet.eu> | 2020-07-26 23:41:01 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-07-27 14:06:23 +0200 |
| commit | 90fdc4328b2aa9dc59fdb88115b0f308affc456f (patch) | |
| tree | 22408706372df98a5efabc646ca4314ea6909afd /src/vehicles/Heli.h | |
| parent | Fix/change some Windows define (diff) | |
| download | re3-90fdc4328b2aa9dc59fdb88115b0f308affc456f.tar re3-90fdc4328b2aa9dc59fdb88115b0f308affc456f.tar.gz re3-90fdc4328b2aa9dc59fdb88115b0f308affc456f.tar.bz2 re3-90fdc4328b2aa9dc59fdb88115b0f308affc456f.tar.lz re3-90fdc4328b2aa9dc59fdb88115b0f308affc456f.tar.xz re3-90fdc4328b2aa9dc59fdb88115b0f308affc456f.tar.zst re3-90fdc4328b2aa9dc59fdb88115b0f308affc456f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/vehicles/Heli.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/vehicles/Heli.h b/src/vehicles/Heli.h index a8f604aa..1f372e42 100644 --- a/src/vehicles/Heli.h +++ b/src/vehicles/Heli.h @@ -21,7 +21,7 @@ enum HELI_RANDOM0, HELI_RANDOM1, HELI_SCRIPT, - HELI_CATALINA, + HELI_CATALINA, // TODO 2 in VC NUM_HELIS }; @@ -36,7 +36,6 @@ enum class CHeli : public CVehicle { public: - // 0x288 RwFrame *m_aHeliNodes[NUM_HELI_NODES]; int8 m_heliStatus; float m_fSearchLightX; @@ -49,6 +48,8 @@ public: int8 m_nHeliId; int8 m_heliType; int8 m_pathState; + int8 m_numSwat; + uint8 m_aSwatState[4]; float m_aSearchLightHistoryX[6]; float m_aSearchLightHistoryY[6]; uint32 m_nSearchLightTimer; @@ -64,7 +65,6 @@ public: static CHeli *pHelis[NUM_HELIS]; static int16 NumRandomHelis; static uint32 TestForNewRandomHelisTimer; - static int16 NumScriptHelis; // unused static bool CatalinaHeliOn; static bool CatalinaHasBeenShotDown; static bool ScriptHeliOn; @@ -79,12 +79,15 @@ public: void PreRenderAlways(void); CObject *SpawnFlyingComponent(int32 component); + CVector FindSwatPositionRelativeToHeli(int n); + bool SendDownSwat(void); static void InitHelis(void); static void UpdateHelis(void); static void SpecialHeliPreRender(void); static bool TestRocketCollision(CVector *coors); static bool TestBulletCollision(CVector *line0, CVector *line1, CVector *bulletPos, int32 damage); + static bool TestSniperCollision(CVector *line0, CVector *line1); static void StartCatalinaFlyBy(void); static void RemoveCatalinaHeli(void); |