diff options
| author | withmorten <morten.with@gmail.com> | 2021-01-13 00:21:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 00:21:20 +0100 |
| commit | 005ddf26c1ccfc0f36d26258189b95a1fe7f5b34 (patch) | |
| tree | d10c3b32c3e121138ff620d34d4b0e70db6ac7ab /src/vehicles | |
| parent | Fix (diff) | |
| parent | move stuff back into class; securom comments (diff) | |
| download | re3-005ddf26c1ccfc0f36d26258189b95a1fe7f5b34.tar.gz | |
Merge pull request #954 from withmorten/master
move stuff back into class; securom comments
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Heli.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Heli.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp index 7008818b..56d6a8eb 100644 --- a/src/vehicles/Heli.cpp +++ b/src/vehicles/Heli.cpp @@ -785,7 +785,7 @@ CHeli::InitHelis(void) } CHeli* -GenerateHeli(bool catalina) +CHeli::GenerateHeli(bool catalina) { CHeli *heli; CVector heliPos; diff --git a/src/vehicles/Heli.h b/src/vehicles/Heli.h index cf3f791f..5fef799b 100644 --- a/src/vehicles/Heli.h +++ b/src/vehicles/Heli.h @@ -81,12 +81,13 @@ public: CObject *SpawnFlyingComponent(int32 component); 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 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); |