diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-01-13 01:08:13 +0100 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-13 01:08:13 +0100 |
commit | 94f25a429fb29eeaf6e7ccd21906ffcff45ebc38 (patch) | |
tree | f5096eee4142233ec6450b68fbd99483c954592c /src/vehicles | |
parent | sync with lcs-dev (diff) | |
parent | Merge pull request #956 from withmorten/miami (diff) | |
download | re3-94f25a429fb29eeaf6e7ccd21906ffcff45ebc38.tar re3-94f25a429fb29eeaf6e7ccd21906ffcff45ebc38.tar.gz re3-94f25a429fb29eeaf6e7ccd21906ffcff45ebc38.tar.bz2 re3-94f25a429fb29eeaf6e7ccd21906ffcff45ebc38.tar.lz re3-94f25a429fb29eeaf6e7ccd21906ffcff45ebc38.tar.xz re3-94f25a429fb29eeaf6e7ccd21906ffcff45ebc38.tar.zst re3-94f25a429fb29eeaf6e7ccd21906ffcff45ebc38.zip |
Diffstat (limited to 'src/vehicles')
-rw-r--r-- | src/vehicles/Cranes.h | 2 | ||||
-rw-r--r-- | src/vehicles/Heli.cpp | 4 | ||||
-rw-r--r-- | src/vehicles/Heli.h | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/vehicles/Cranes.h b/src/vehicles/Cranes.h index 162f9af9..e842ed3f 100644 --- a/src/vehicles/Cranes.h +++ b/src/vehicles/Cranes.h @@ -88,7 +88,7 @@ public: static bool IsThisCarBeingCarriedByAnyCrane(CVehicle* pVehicle); static bool IsThisCarBeingTargettedByAnyCrane(CVehicle* pVehicle); static void Save(uint8* buf, uint32* size); - static void Load(uint8* buf, uint32 size); // on mobile it's CranesLoad outside of the class + static void Load(uint8* buf, uint32 size); // out of class in III PC and later because of SecuROM static uint32 CarsCollectedMilitaryCrane; static int32 NumCranes; diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp index 644fdde8..1c1b2617 100644 --- a/src/vehicles/Heli.cpp +++ b/src/vehicles/Heli.cpp @@ -762,7 +762,7 @@ CHeli::InitHelis(void) } CHeli* -GenerateHeli(bool catalina) +CHeli::GenerateHeli(bool catalina) { CHeli *heli; CVector heliPos; @@ -800,7 +800,7 @@ GenerateHeli(bool catalina) id++; found = true; for(i = 0; i < 4; i++) - if(CHeli::pHelis[i] && CHeli::pHelis[i]->m_nHeliId == id) + if(pHelis[i] && pHelis[i]->m_nHeliId == id) found = false; } heli->m_nHeliId = id; diff --git a/src/vehicles/Heli.h b/src/vehicles/Heli.h index 1f372e42..c5ae08e2 100644 --- a/src/vehicles/Heli.h +++ b/src/vehicles/Heli.h @@ -83,13 +83,14 @@ public: bool SendDownSwat(void); static void InitHelis(void); + static CHeli *GenerateHeli(bool catalina); // out of class in III PC and later because of SecuROM 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 StartCatalinaFlyBy(void); // out of class in III PC and later because of SecuROM static void RemoveCatalinaHeli(void); static CHeli *FindPointerToCatalinasHeli(void); static void CatalinaTakeOff(void); |