Merge branch 'miami' into lcs

# Conflicts:
#	premake5.lua

1 files changed, 50 insertions, 0 deletions

diff --git a/src/renderer/WaterCreatures.h b/src/renderer/WaterCreatures.h
new file mode 100644
index 00000000..099cc1a4
--- /dev/null
+++ b/src/renderer/WaterCreatures.h
@@ -0,0 +1,50 @@
+#pragma once
+
+class CObject;
+
+/*
+enum eFishSlotState {
+	WATER_CREATURE_INIT = 0,
+	WATER_CREATURE_ACTIVE,
+	WATER_CREATURE_FADE_OUT,
+	WATER_CREATURE_REMOVE,
+	WATER_CREATURE_DISABLED
+};
+
+class CWaterCreature {
+public:
+	CObject *m_pObj;
+	float m_fFwdSpeed;
+	float m_fZTurnSpeed;
+	int32 m_alpha;
+	float m_fWaterDepth;
+	int32 m_state;
+
+	CWaterCreature();
+	void Allocate(CObject *pObj, float fFwdSpeed, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state);
+	void Free();
+	void Initialise(CObject *pObj, float fFwdSpeed, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state);
+};
+
+class CWaterCreatures {
+
+public:
+	static CWaterCreature aWaterCreatures[NUM_WATER_CREATURES];
+	static int32 nNumActiveSeaLifeForms;
+	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();
+	static float CalculateFishHeading(CVector const& pos1, CVector const& pos2);
+	static void RemoveAll();
+	static CWaterCreature* GetFishStructSlot();
+};
+
+struct WaterCreatureProperties {
+	int16 *modelID;
+	float fFwdSpeed;
+	float fLevel;
+	float fUnknown; //unused
+	float fWaterDepth;
+};*/
\ No newline at end of file