Merge pull request #954 from withmorten/master

move stuff back into class; securom comments
This commit is contained in:
withmorten 2021-01-13 00:21:20 +01:00 committed by GitHub
commit 005ddf26c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions

View File

@ -79,7 +79,7 @@ class CWaterLevel
static int16 nGeomUsed;
public:
static void Initialise(Const char *pWaterDat);
static void Initialise(Const char *pWaterDat); // out of class in III PC and later because of SecuROM
static void Shutdown();
static void CreateWavyAtomic();
static void DestroyWavyAtomic();

View File

@ -785,7 +785,7 @@ CHeli::InitHelis(void)
}
CHeli*
GenerateHeli(bool catalina)
CHeli::GenerateHeli(bool catalina)
{
CHeli *heli;
CVector heliPos;

View File

@ -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);