summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-01-13 00:18:34 +0100
committerwithmorten <morten.with@gmail.com>2021-01-13 00:18:34 +0100
commitc210e1bae653a51b1d5d6fda4098c74448a83fa3 (patch)
tree9067cf85290da82ace5d7b05676f532ceaa4100e
parentfix CreateInstance virtual overload order (diff)
downloadre3-c210e1bae653a51b1d5d6fda4098c74448a83fa3.tar
re3-c210e1bae653a51b1d5d6fda4098c74448a83fa3.tar.gz
re3-c210e1bae653a51b1d5d6fda4098c74448a83fa3.tar.bz2
re3-c210e1bae653a51b1d5d6fda4098c74448a83fa3.tar.lz
re3-c210e1bae653a51b1d5d6fda4098c74448a83fa3.tar.xz
re3-c210e1bae653a51b1d5d6fda4098c74448a83fa3.tar.zst
re3-c210e1bae653a51b1d5d6fda4098c74448a83fa3.zip
Diffstat (limited to '')
-rw-r--r--src/render/WaterLevel.h2
-rw-r--r--src/vehicles/Heli.cpp2
-rw-r--r--src/vehicles/Heli.h3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/render/WaterLevel.h b/src/render/WaterLevel.h
index cf3537ae..b797f251 100644
--- a/src/render/WaterLevel.h
+++ b/src/render/WaterLevel.h
@@ -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();
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);