diff options
| author | majestic <majesticcoding@gmail.com> | 2020-10-09 14:53:22 +0200 |
|---|---|---|
| committer | majestic <majesticcoding@gmail.com> | 2020-10-11 02:49:54 +0200 |
| commit | e7ef45a6069493ce4a49ad0fd613aeb598709524 (patch) | |
| tree | 2d59c72422e839808f1fca5a2dad1212c60db470 /src/render/WaterCreatures.h | |
| parent | CWaterCreatures (diff) | |
| parent | Fix sniper and water creatures bug, mark some files (diff) | |
| download | re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.tar re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.tar.gz re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.tar.bz2 re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.tar.lz re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.tar.xz re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.tar.zst re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.zip | |
Diffstat (limited to 'src/render/WaterCreatures.h')
| -rw-r--r-- | src/render/WaterCreatures.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/WaterCreatures.h b/src/render/WaterCreatures.h index b935b11d..7dcaa288 100644 --- a/src/render/WaterCreatures.h +++ b/src/render/WaterCreatures.h @@ -1,7 +1,7 @@ #pragma once #include "Object.h" -enum { +enum eFishSlotState { WATER_CREATURE_ALLOCATED = 0, WATER_CREATURE_ACTIVE, WATER_CREATURE_UPDATE, @@ -20,9 +20,9 @@ public: CWaterCreature(); ~CWaterCreature(); - void Allocate(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, int eFishSlotState); + void Allocate(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state); void Free(); - void Initialise(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, int eFishSlotState); + void Initialise(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state); }; class CWaterCreatures { @@ -30,8 +30,8 @@ class CWaterCreatures { public: static CWaterCreature aWaterCreatures[NUM_WATER_CREATURES]; static int32 nNumActiveSeaLifeForms; - static CObject *CreateSeaLifeForm(CVector pos, int16 modelID, float zRotAngle); - static void CreateOne(CVector pos, int16 modelID); + static CObject *CreateSeaLifeForm(CVector const& pos, int16 modelID, int32 zRotAngle); + static void CreateOne(CVector const& pos, int32 modelID); static void UpdateAll(); static void FreeFishStructSlot(CWaterCreature *wc); static bool IsSpaceForMoreWaterCreatures(); @@ -44,6 +44,6 @@ struct WaterCreatureProperties { int16 *modelID; float fRightMult; float fLevel; - float fUnk2; + float fUnknown; //unused float fWaterDepth; };
\ No newline at end of file |