1 files changed, 77 insertions, 70 deletions

diff --git a/src/render/WaterCreatures.cpp b/src/render/WaterCreatures.cpp
index 90f24183..d3bd2701 100644
--- a/src/render/WaterCreatures.cpp
+++ b/src/render/WaterCreatures.cpp
@@ -11,70 +11,70 @@ int CWaterCreatures::nNumActiveSeaLifeForms;
 CWaterCreature CWaterCreatures::aWaterCreatures[NUM_WATER_CREATURES];
 
 struct WaterCreatureProperties aProperties[65] = {
-	{ &MI_FISH1SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH1SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH2SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH2SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH3SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH3SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH3S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH1SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH1SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH2SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH2SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH3SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH3SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH3S,		0.04f, 1.5f, 0.0008f, 3.0f },
 	{ &MI_JELLYFISH,	0.01f, 2.2f, 0.0005f, 3.5f },
 	{ &MI_JELLYFISH01,	0.01f, 2.2f, 0.0005f, 3.5f },
-	{ &MI_FISH1SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH1SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH2SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH2SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH3SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH3SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH3S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH1SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH1SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH2SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH2SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH3SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH3SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH3S,		0.04f, 1.5f, 0.0008f, 3.0f },
 	{ &MI_TURTLE,		0.01f, 2.0f, 0.0005f, 4.0f },
-	{ &MI_FISH1SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH1SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH2SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH2SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH3SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH3SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH3S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH1SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH1SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH2SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH2SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH3SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH3SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH3S,		0.04f, 1.5f, 0.0008f, 3.0f },
 	{ &MI_DOLPHIN,		0.03f, 1.5f, 0.0005f, 4.0f },
-	{ &MI_FISH1SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH1SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH2SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH2SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH3SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH3SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH3S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH1SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH1SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH2SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH2SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH3SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH3SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH3S,		0.04f, 1.5f, 0.0008f, 3.0f },
 	{ &MI_SHARK,		0.03f, 0.4f, 0.0005f, 4.0f },
-	{ &MI_FISH1SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH1SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH2SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH2SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH3SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH3SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH3S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH1SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH1SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH2SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH2SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH2S,		0.04f, 1.5f, 0.0008f, 3.0f },
-	{ &MI_FISH3SINGLE,	0.04f, 3.0f, 0.0008f, 3.0f },
+	{ &MI_FISH3SINGLE,	0.04f, 1.0f, 0.0008f, 3.0f },
 	{ &MI_FISH3S,		0.04f, 1.5f, 0.0008f, 3.0f },
 };
 
@@ -82,21 +82,17 @@ CWaterCreature::CWaterCreature() {
 	Free();
 }
 
-CWaterCreature::~CWaterCreature() {
-	//looks like unused
-}
-
-void CWaterCreature::Initialise(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state) {
+void CWaterCreature::Initialise(CObject *pObj, float fFwdSpeed, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state) {
 	this->m_pObj = pObj;
-	this->m_fRightMult = fRightMult;
+	this->m_fFwdSpeed = fFwdSpeed;
 	this->m_fZTurnSpeed = fZTurnSpeed;
 	this->m_fWaterDepth = fWaterDepth;
 	this->m_alpha = alpha;
 	this->m_state = state;
 }
 
-void CWaterCreature::Allocate(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state) {
-	CWaterCreature::Initialise(pObj, fRightMult, fZTurnSpeed, fWaterDepth, alpha, state);
+void CWaterCreature::Allocate(CObject *pObj, float fFwdSpeed, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state) {
+	CWaterCreature::Initialise(pObj, fFwdSpeed, fZTurnSpeed, fWaterDepth, alpha, state);
 }
 
 void CWaterCreature::Free() {
@@ -112,14 +108,14 @@ CWaterCreature *CWaterCreatures::GetFishStructSlot() {
 }
 
 CObject *CWaterCreatures::CreateSeaLifeForm(CVector const& pos, int16 modelID, int32 zRotAngle) {
-	if (CObject::nNoTempObjects >= 40)
+	if (CObject::nNoTempObjects >= NUMTEMPOBJECTS)
 		return nil;
 
 	CObject *pObj = new CObject(modelID, true);
 
 	if (!pObj) return nil;
 	
-	pObj->GetMatrix().GetPosition() = pos;
+	pObj->SetPosition(pos);
 	pObj->GetMatrix().UpdateRW();
 	pObj->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
 	pObj->m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
@@ -148,32 +144,34 @@ float CWaterCreatures::CalculateFishHeading(CVector const& pos1, CVector const&
 	CVector delta = pos1 - pos2;
 	delta.Normalise();
 
-	return Atan2(-delta.x, delta.y);
+	return CGeneral::GetRandomNumberInRange(-90, 90) +
+		RADTODEG(delta.Heading() + HALFPI + PI);
 }
 
 void CWaterCreatures::CreateOne(CVector const& pos, int32 modelID) {
 	if (!IsSpaceForMoreWaterCreatures())
 		return;
 
-	CVector storedPos = pos;
+	CVector playerPos = FindPlayerPed()->GetPosition();
+	CVector fishPos = pos;
 	float fDepth, fLevelNoWaves;
-	if (!TheCamera.IsSphereVisible(storedPos, 3.0f)
-		&& CWaterLevel::GetWaterDepth(storedPos, &fDepth, &fLevelNoWaves, nil) && fDepth > 4.5f) {
+	if (!TheCamera.IsSphereVisible(fishPos, 3.0f)
+		&& CWaterLevel::GetWaterDepth(fishPos, &fDepth, &fLevelNoWaves, nil) && fDepth > 4.5f) {
 		
 		if (modelID == -1 || modelID < 0 || modelID > 64)
 			modelID = CGeneral::GetRandomNumberInRange(0, 64);
 
 		WaterCreatureProperties *creature = &aProperties[modelID];
-		storedPos.z = fLevelNoWaves - creature->fLevel;
-		float fRightMult = CGeneral::GetRandomNumberInRange(0.0f, creature->fRightMult) + 0.01f;
-		float angle = CWaterCreatures::CalculateFishHeading(FindPlayerPed()->GetPosition(), storedPos);
+		fishPos.z = fLevelNoWaves - creature->fLevel;
+		float fFwdSpeed = CGeneral::GetRandomNumberInRange(0.0f, creature->fFwdSpeed) + 0.01f;
+		float angle = CWaterCreatures::CalculateFishHeading(playerPos, fishPos);
 		
-		CObject *fish = CreateSeaLifeForm(storedPos, *(int16*)creature->modelID, angle);
+		CObject *fish = CreateSeaLifeForm(fishPos, *creature->modelID, angle);
 		if (!fish) return;
 
 		fish->SetRwObjectAlpha(255); 
 		CWaterCreature *wc = GetFishStructSlot();
-		wc->Allocate(fish, fRightMult, 0.0f, creature->fWaterDepth, 255, WATER_CREATURE_ALLOCATED);
+		wc->Allocate(fish, fFwdSpeed, 0.0f, creature->fWaterDepth, 255, WATER_CREATURE_INIT);
 		nNumActiveSeaLifeForms++;
 	}
 }
@@ -189,62 +187,68 @@ void CWaterCreatures::UpdateAll() {
 	CVector playerPos = FindPlayerPed()->GetPosition();
 	for (int i = 0; i < NUM_WATER_CREATURES; i++) {
 		switch (aWaterCreatures[i].m_state) {
-		case WATER_CREATURE_ACTIVE: 
+		case WATER_CREATURE_ACTIVE:
+			// is this even reachable?
 			aWaterCreatures[i].m_pObj->m_nEndOfLifeTime = CTimer::GetTimeInMilliseconds() + 40000;
 			if (!aWaterCreatures[i].m_pObj->GetIsOnScreen()) {
 				aWaterCreatures[i].m_pObj->SetRwObjectAlpha(0);
-				aWaterCreatures[i].m_state = WATER_CREATURE_TO_REMOVE;
+				aWaterCreatures[i].m_state = WATER_CREATURE_REMOVE;
 				break;
 			}
-		case WATER_CREATURE_ALLOCATED: {
-			if ((playerPos - aWaterCreatures[i].m_pObj->GetPosition()).Magnitude() < SQR(75.0f)) {
+			// fall through
+		case WATER_CREATURE_INIT: {
+			if ((playerPos - aWaterCreatures[i].m_pObj->GetPosition()).MagnitudeSqr() < SQR(75.0f)) {
 				if (aWaterCreatures[i].m_alpha < 255)
 					aWaterCreatures[i].m_alpha = Min(aWaterCreatures[i].m_alpha + 4, 255);
 				aWaterCreatures[i].m_pObj->SetRwObjectAlpha(aWaterCreatures[i].m_alpha);
-				CVector newRight = aWaterCreatures[i].m_pObj->GetRight();
-				newRight.Normalise();
-				aWaterCreatures[i].m_pObj->m_vecMoveSpeed = newRight * aWaterCreatures[i].m_fRightMult;
+				CVector fwd = aWaterCreatures[i].m_pObj->GetRight();	// for some reason they used x for forward
+				fwd.Normalise();
+				aWaterCreatures[i].m_pObj->m_vecMoveSpeed = fwd * aWaterCreatures[i].m_fFwdSpeed;
 				aWaterCreatures[i].m_pObj->m_vecTurnSpeed = CVector(0.0f, 0.0f, aWaterCreatures[i].m_fZTurnSpeed);
 				aWaterCreatures[i].m_pObj->bIsStatic = false;
 				float fDepth = 0.0;
 				CWaterLevel::GetWaterDepth(aWaterCreatures[i].m_pObj->GetPosition(), &fDepth, nil, nil);
 				if (aWaterCreatures[i].m_fWaterDepth < fDepth) {
+					// it looks like this can never be true initially, looks like a BUG
 					if (aWaterCreatures[i].m_pObj->m_nEndOfLifeTime - 40000 <= CTimer::GetTimeInMilliseconds())
 						aWaterCreatures[i].m_state = WATER_CREATURE_ACTIVE;
 				}
 				else {
-					aWaterCreatures[i].m_state = WATER_CREATURE_UPDATE;
+					// creature is deeper than water
+					aWaterCreatures[i].m_state = WATER_CREATURE_FADE_OUT;
 				}
 
 			}
 			else {
-				aWaterCreatures[i].m_state = WATER_CREATURE_TO_REMOVE;
+				aWaterCreatures[i].m_state = WATER_CREATURE_REMOVE;
 			}
 			break;
 		}
-		case WATER_CREATURE_UPDATE: {
+		case WATER_CREATURE_FADE_OUT: {
 			aWaterCreatures[i].m_pObj->m_nEndOfLifeTime = CTimer::GetTimeInMilliseconds() + 40000;
 			if (aWaterCreatures[i].m_alpha <= 0) {
-				aWaterCreatures[i].m_state = WATER_CREATURE_TO_REMOVE;
+				aWaterCreatures[i].m_state = WATER_CREATURE_REMOVE;
 			}
 			else {
 				aWaterCreatures[i].m_alpha = Max(aWaterCreatures[i].m_alpha - 6, 0);
 				aWaterCreatures[i].m_pObj->SetRwObjectAlpha(aWaterCreatures[i].m_alpha);
-				CVector newRight = aWaterCreatures[i].m_pObj->GetRight();
-				newRight.Normalise();
-				newRight.x *= aWaterCreatures[i].m_fRightMult;
-				newRight.y *= aWaterCreatures[i].m_fRightMult;
-				newRight.z -= 0.015f;
-				aWaterCreatures[i].m_pObj->m_vecMoveSpeed = newRight;
+				CVector speed = aWaterCreatures[i].m_pObj->GetRight();
+				speed.Normalise();
+				speed.x *= aWaterCreatures[i].m_fFwdSpeed;
+				speed.y *= aWaterCreatures[i].m_fFwdSpeed;
+				speed.z = -0.015f;
+				aWaterCreatures[i].m_pObj->m_vecMoveSpeed = speed;
 
 				if (!aWaterCreatures[i].m_pObj->GetIsOnScreen())
-					aWaterCreatures[i].m_state = WATER_CREATURE_TO_REMOVE;
+					aWaterCreatures[i].m_state = WATER_CREATURE_REMOVE;
 			}
 			break;
 		}
-		case WATER_CREATURE_TO_REMOVE: 
-			if (aWaterCreatures[i].m_pObj)
+		case WATER_CREATURE_REMOVE: 
+			if (aWaterCreatures[i].m_pObj){
 				CWorld::Remove(aWaterCreatures[i].m_pObj);
+				delete aWaterCreatures[i].m_pObj;
+			}
 			FreeFishStructSlot(&aWaterCreatures[i]);
 			nNumActiveSeaLifeForms--;
 			aWaterCreatures[i].m_state = WATER_CREATURE_DISABLED;
@@ -258,7 +262,10 @@ void CWaterCreatures::UpdateAll() {
 void CWaterCreatures::RemoveAll() {
 	for (int i = 0; i < NUM_WATER_CREATURES; i++) {
 		if (aWaterCreatures[i].m_state != WATER_CREATURE_DISABLED) {
-			CWorld::Remove(aWaterCreatures[i].m_pObj);
+			if (aWaterCreatures[i].m_pObj){
+				CWorld::Remove(aWaterCreatures[i].m_pObj);
+				delete aWaterCreatures[i].m_pObj;
+			}
 			FreeFishStructSlot(&aWaterCreatures[i]);
 			aWaterCreatures[i].m_state = WATER_CREATURE_DISABLED;
 			nNumActiveSeaLifeForms--;