Disable water creatures

This commit is contained in:
Sergeanur 2021-01-08 18:26:35 +02:00
parent 95260371cb
commit e9001207ea
5 changed files with 15 additions and 11 deletions

View file

@ -1287,7 +1287,7 @@ void CReplay::TriggerPlayback(uint8 cam_mode, float cam_x, float cam_y, float ca
DMAudio.SetEffectsFadeVol(0); DMAudio.SetEffectsFadeVol(0);
DMAudio.SetMusicFadeVol(0); DMAudio.SetMusicFadeVol(0);
CEscalators::Shutdown(); CEscalators::Shutdown();
CWaterCreatures::RemoveAll(); //CWaterCreatures::RemoveAll();
int current; int current;
for (current = 0; current < NUM_REPLAYBUFFERS; current++) for (current = 0; current < NUM_REPLAYBUFFERS; current++)
if (BufferStatus[current] == REPLAYBUFFER_RECORD) if (BufferStatus[current] == REPLAYBUFFER_RECORD)

View file

@ -587,7 +587,7 @@ bool CGame::ShutDown(void)
CPlane::Shutdown(); CPlane::Shutdown();
CTrain::Shutdown(); CTrain::Shutdown();
CScriptPaths::Shutdown(); CScriptPaths::Shutdown();
CWaterCreatures::RemoveAll(); //CWaterCreatures::RemoveAll();
CSpecialFX::Shutdown(); CSpecialFX::Shutdown();
CGarages::Shutdown(); CGarages::Shutdown();
CMovingThings::Shutdown(); CMovingThings::Shutdown();
@ -749,7 +749,7 @@ void CGame::ShutDownForRestart(void)
CRadar::RemoveRadarSections(); CRadar::RemoveRadarSections();
FrontEndMenuManager.UnloadTextures(); FrontEndMenuManager.UnloadTextures();
CParticleObject::RemoveAllExpireableParticleObjects(); CParticleObject::RemoveAllExpireableParticleObjects();
CWaterCreatures::RemoveAll(); //CWaterCreatures::RemoveAll();
CSetPieces::Init(); CSetPieces::Init();
CPedType::Shutdown(); CPedType::Shutdown();
CSpecialFX::Shutdown(); CSpecialFX::Shutdown();

View file

@ -7,6 +7,7 @@
#include "config.h" #include "config.h"
#include "General.h" #include "General.h"
/*
int CWaterCreatures::nNumActiveSeaLifeForms; int CWaterCreatures::nNumActiveSeaLifeForms;
CWaterCreature CWaterCreatures::aWaterCreatures[NUM_WATER_CREATURES]; CWaterCreature CWaterCreatures::aWaterCreatures[NUM_WATER_CREATURES];
@ -272,3 +273,4 @@ void CWaterCreatures::RemoveAll() {
} }
} }
} }
*/

View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "Object.h" #include "Object.h"
/*
enum eFishSlotState { enum eFishSlotState {
WATER_CREATURE_INIT = 0, WATER_CREATURE_INIT = 0,
WATER_CREATURE_ACTIVE, WATER_CREATURE_ACTIVE,
@ -45,4 +46,4 @@ struct WaterCreatureProperties {
float fLevel; float fLevel;
float fUnknown; //unused float fUnknown; //unused
float fWaterDepth; float fWaterDepth;
}; };*/

View file

@ -1175,13 +1175,13 @@ CWaterLevel::RenderWater()
if ( WavesCalculatedThisFrame ) if ( WavesCalculatedThisFrame )
{ {
RenderSeaBirds(); RenderSeaBirds();
RenderShipsOnHorizon(); //RenderShipsOnHorizon();
CParticle::HandleShipsAtHorizonStuff(); //CParticle::HandleShipsAtHorizonStuff();
HandleBeachToysStuff(); //HandleBeachToysStuff();
} }
if ( _bSeaLife ) //if ( _bSeaLife )
HandleSeaLifeForms(); // HandleSeaLifeForms();
DefinedState(); DefinedState();
} }
@ -3105,6 +3105,7 @@ CWaterLevel::RenderShipsOnHorizon()
} }
} }
/*
void void
CWaterLevel::HandleSeaLifeForms() CWaterLevel::HandleSeaLifeForms()
{ {
@ -3145,7 +3146,7 @@ CWaterLevel::HandleSeaLifeForms()
} }
CWaterCreatures::UpdateAll(); CWaterCreatures::UpdateAll();
} }*/
void void
CWaterLevel::HandleBeachToysStuff(void) CWaterLevel::HandleBeachToysStuff(void)