summaryrefslogtreecommitdiffstats
path: root/src/render/WaterCreatures.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-10-31 14:33:49 +0100
committeraap <aap@papnet.eu>2020-10-31 14:33:49 +0100
commitea5b86774d23695f2638b51e2ead9621ddadbf82 (patch)
tree0812de29452b8a9d37fe5ded37a1815403aeabf6 /src/render/WaterCreatures.h
parentDisable loading screen (diff)
downloadre3-ea5b86774d23695f2638b51e2ead9621ddadbf82.tar
re3-ea5b86774d23695f2638b51e2ead9621ddadbf82.tar.gz
re3-ea5b86774d23695f2638b51e2ead9621ddadbf82.tar.bz2
re3-ea5b86774d23695f2638b51e2ead9621ddadbf82.tar.lz
re3-ea5b86774d23695f2638b51e2ead9621ddadbf82.tar.xz
re3-ea5b86774d23695f2638b51e2ead9621ddadbf82.tar.zst
re3-ea5b86774d23695f2638b51e2ead9621ddadbf82.zip
Diffstat (limited to 'src/render/WaterCreatures.h')
-rw-r--r--src/render/WaterCreatures.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/render/WaterCreatures.h b/src/render/WaterCreatures.h
index 7dcaa288..9ef8198c 100644
--- a/src/render/WaterCreatures.h
+++ b/src/render/WaterCreatures.h
@@ -2,27 +2,26 @@
#include "Object.h"
enum eFishSlotState {
- WATER_CREATURE_ALLOCATED = 0,
+ WATER_CREATURE_INIT = 0,
WATER_CREATURE_ACTIVE,
- WATER_CREATURE_UPDATE,
- WATER_CREATURE_TO_REMOVE,
+ WATER_CREATURE_FADE_OUT,
+ WATER_CREATURE_REMOVE,
WATER_CREATURE_DISABLED
};
class CWaterCreature {
public:
CObject *m_pObj;
- float m_fRightMult;
+ float m_fFwdSpeed;
float m_fZTurnSpeed;
int32 m_alpha;
float m_fWaterDepth;
int32 m_state;
CWaterCreature();
- ~CWaterCreature();
- void Allocate(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state);
+ void Allocate(CObject *pObj, float fFwdSpeed, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state);
void Free();
- void Initialise(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state);
+ void Initialise(CObject *pObj, float fFwdSpeed, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state);
};
class CWaterCreatures {
@@ -42,7 +41,7 @@ public:
struct WaterCreatureProperties {
int16 *modelID;
- float fRightMult;
+ float fFwdSpeed;
float fLevel;
float fUnknown; //unused
float fWaterDepth;