summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-01-29 13:43:50 +0100
committeraap <aap@papnet.eu>2021-01-29 13:43:50 +0100
commit595a000f6a72a0bf376f5c019a76bcec9dc98c2f (patch)
tree2650ca69a8770fdd073d219be7e2d5ca77cc950c
parentwaterlevel fix fix (diff)
downloadre3-595a000f6a72a0bf376f5c019a76bcec9dc98c2f.tar
re3-595a000f6a72a0bf376f5c019a76bcec9dc98c2f.tar.gz
re3-595a000f6a72a0bf376f5c019a76bcec9dc98c2f.tar.bz2
re3-595a000f6a72a0bf376f5c019a76bcec9dc98c2f.tar.lz
re3-595a000f6a72a0bf376f5c019a76bcec9dc98c2f.tar.xz
re3-595a000f6a72a0bf376f5c019a76bcec9dc98c2f.tar.zst
re3-595a000f6a72a0bf376f5c019a76bcec9dc98c2f.zip
-rw-r--r--src/core/Game.cpp4
-rw-r--r--src/render/WaterLevel.cpp1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 83d30bb4..ed9d67f4 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -591,7 +591,6 @@ bool CGame::ShutDown(void)
gPhoneInfo.Shutdown();
CWeapon::ShutdownWeapons();
CPedType::Shutdown();
- CMBlur::MotionBlurClose();
for (int32 i = 0; i < NUMPLAYERS; i++)
{
@@ -617,7 +616,7 @@ bool CGame::ShutDown(void)
CStreaming::Shutdown();
CTxdStore::GameShutdown();
CCollision::Shutdown();
- CWaterLevel::DestroyWavyAtomic();
+ CWaterLevel::Shutdown();
CRubbish::Shutdown();
CClouds::Shutdown();
CShadows::Shutdown();
@@ -626,6 +625,7 @@ bool CGame::ShutDown(void)
CWeaponEffects::Shutdown();
CParticle::Shutdown();
CPools::ShutDown();
+ CHud::ReInitialise();
CTxdStore::RemoveTxdSlot(gameTxdSlot);
CMBlur::MotionBlurClose();
CdStreamRemoveImages();
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 9b2dd816..d67b9d42 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -318,6 +318,7 @@ CWaterLevel::Shutdown()
_DELETE_TEXTURE(gpWaterTex);
_DELETE_TEXTURE(gpWaterEnvTex);
+ _DELETE_TEXTURE(gpWaterWakeTex);
_DELETE_TEXTURE(gpWaterEnvBaseTex);
#undef _DELETE_TEXTURE