5 files changed, 15 insertions, 11 deletions

diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index 37a54999..7adb4999 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -1287,7 +1287,7 @@ void CReplay::TriggerPlayback(uint8 cam_mode, float cam_x, float cam_y, float ca
 	DMAudio.SetEffectsFadeVol(0);
 	DMAudio.SetMusicFadeVol(0);
 	CEscalators::Shutdown();
-	CWaterCreatures::RemoveAll();
+	//CWaterCreatures::RemoveAll();
 	int current;
 	for (current = 0; current < NUM_REPLAYBUFFERS; current++)
 		if (BufferStatus[current] == REPLAYBUFFER_RECORD)
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 79698dde..636eed42 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -587,7 +587,7 @@ bool CGame::ShutDown(void)
 	CPlane::Shutdown();
 	CTrain::Shutdown();
 	CScriptPaths::Shutdown();
-	CWaterCreatures::RemoveAll();
+	//CWaterCreatures::RemoveAll();
 	CSpecialFX::Shutdown();
 	CGarages::Shutdown();
 	CMovingThings::Shutdown();
@@ -749,7 +749,7 @@ void CGame::ShutDownForRestart(void)
 	CRadar::RemoveRadarSections();
 	FrontEndMenuManager.UnloadTextures();
 	CParticleObject::RemoveAllExpireableParticleObjects();
-	CWaterCreatures::RemoveAll(); 
+	//CWaterCreatures::RemoveAll(); 
 	CSetPieces::Init();
 	CPedType::Shutdown();
 	CSpecialFX::Shutdown();
diff --git a/src/render/WaterCreatures.cpp b/src/render/WaterCreatures.cpp
index d3bd2701..b44f987c 100644
--- a/src/render/WaterCreatures.cpp
+++ b/src/render/WaterCreatures.cpp
@@ -7,6 +7,7 @@
 #include "config.h"
 #include "General.h"
 
+/*
 int CWaterCreatures::nNumActiveSeaLifeForms;
 CWaterCreature CWaterCreatures::aWaterCreatures[NUM_WATER_CREATURES];
 
@@ -271,4 +272,5 @@ void CWaterCreatures::RemoveAll() {
 			nNumActiveSeaLifeForms--;
 		}
 	}
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
diff --git a/src/render/WaterCreatures.h b/src/render/WaterCreatures.h
index 9ef8198c..0b8d2376 100644
--- a/src/render/WaterCreatures.h
+++ b/src/render/WaterCreatures.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "Object.h"
 
+/*
 enum eFishSlotState {
 	WATER_CREATURE_INIT = 0,
 	WATER_CREATURE_ACTIVE,
@@ -45,4 +46,4 @@ struct WaterCreatureProperties {
 	float fLevel;
 	float fUnknown; //unused
 	float fWaterDepth;
-};
\ No newline at end of file
+};*/
\ No newline at end of file
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 854653f0..6caac31e 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -1175,13 +1175,13 @@ CWaterLevel::RenderWater()
 	if ( WavesCalculatedThisFrame )
 	{
 		RenderSeaBirds();
-		RenderShipsOnHorizon();
-		CParticle::HandleShipsAtHorizonStuff();
-		HandleBeachToysStuff();
+		//RenderShipsOnHorizon();
+		//CParticle::HandleShipsAtHorizonStuff();
+		//HandleBeachToysStuff();
 	}
 	
-	if ( _bSeaLife )
-		HandleSeaLifeForms();
+	//if ( _bSeaLife )
+	//	HandleSeaLifeForms();
 
 	DefinedState();
 }
@@ -3105,6 +3105,7 @@ CWaterLevel::RenderShipsOnHorizon()
 	}
 }
 
+/*
 void
 CWaterLevel::HandleSeaLifeForms()
 {
@@ -3145,7 +3146,7 @@ CWaterLevel::HandleSeaLifeForms()
 	}
 	
 	CWaterCreatures::UpdateAll();
-}
+}*/
 
 void
 CWaterLevel::HandleBeachToysStuff(void)