a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-22 19:30:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #954 from withmorten/master

Browse source 
move stuff back into class; securom comments
This commit is contained in:
withmorten 2021-01-13 00:21:20 +01:00 committed by GitHub
parent 4fe64d1b0d c210e1bae6
commit 005ddf26c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/render/WaterLevel.h
View file

@ -79,7 +79,7 @@ class CWaterLevel
static int16 nGeomUsed; static int16 nGeomUsed;
public: 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 Shutdown();
static void CreateWavyAtomic(); static void CreateWavyAtomic();
static void DestroyWavyAtomic(); static void DestroyWavyAtomic();

2
src/vehicles/Heli.cpp
View file

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

3
src/vehicles/Heli.h
View file

@ -81,12 +81,13 @@ public:
CObject *SpawnFlyingComponent(int32 component); CObject *SpawnFlyingComponent(int32 component);
static void InitHelis(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 UpdateHelis(void);
static void SpecialHeliPreRender(void); static void SpecialHeliPreRender(void);
static bool TestRocketCollision(CVector *coors); static bool TestRocketCollision(CVector *coors);
static bool TestBulletCollision(CVector *line0, CVector *line1, CVector *bulletPos, int32 damage); 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 void RemoveCatalinaHeli(void);
static CHeli *FindPointerToCatalinasHeli(void); static CHeli *FindPointerToCatalinasHeli(void);
static void CatalinaTakeOff(void); static void CatalinaTakeOff(void);