Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWaterCreatures

Browse Source
This commit is contained in:
majestic
2020-10-09 05:53:22 -07:00
parent c091a5c11a a01b14f301
commit e7ef45a606
16 changed files with 100 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/render/WaterCreatures.h
View File

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