Merge branch 'master' into master

src/render/Clouds.cpp

@@ -40,6 +40,16 @@ CClouds::Init(void)
 	CloudRotation = 0.0f;
 }
 
+void
+CClouds::Shutdown(void)
+{
+	RwTextureDestroy(gpCloudTex[0]);
+	RwTextureDestroy(gpCloudTex[1]);
+	RwTextureDestroy(gpCloudTex[2]);
+	RwTextureDestroy(gpCloudTex[3]);
+	RwTextureDestroy(gpCloudTex[4]);
+}
+
 void
 CClouds::Update(void)
 {
@@ -48,7 +58,6 @@ CClouds::Update(void)
 	IndividualRotation += (CWeather::Wind*CTimer::GetTimeStep() + 0.3f) * 60.0f;
 }
 
-
 void
 CClouds::Render(void)
 {
@@ -424,6 +433,7 @@ CClouds::RenderHorizon(void)
 
 STARTPATCHES
 	InjectHook(0x4F6C10, CClouds::Init, PATCH_JUMP);
+	InjectHook(0x4F6CA0, CClouds::Shutdown, PATCH_JUMP);
 	InjectHook(0x4F6CE0, CClouds::Update, PATCH_JUMP);
 	InjectHook(0x4F6D90, CClouds::Render, PATCH_JUMP);
 	InjectHook(0x4F7F00, CClouds::RenderBackground, PATCH_JUMP);

src/render/Clouds.h

@@ -12,6 +12,7 @@ public:
 	static CRGBA &ms_colourBottom;
 
 	static void Init(void);
+	static void Shutdown(void);
 	static void Update(void);
 	static void Render(void);
 	static void RenderBackground(int16 topred, int16 topgreen, int16 topblue,

src/render/Renderer.cpp

@@ -53,6 +53,12 @@ CRenderer::Init(void)
 	SortBIGBuildings();
 }
 
+void
+CRenderer::Shutdown(void)
+{
+	gSortedVehiclesAndPeds.Shutdown();
+}
+
 void
 CRenderer::PreRender(void)
 {
@@ -1170,6 +1176,7 @@ CRenderer::RemoveVehiclePedLights(CEntity *ent, bool reset)
 
 STARTPATCHES
 	InjectHook(0x4A7680, CRenderer::Init, PATCH_JUMP);
+	InjectHook(0x4A76A0, CRenderer::Shutdown, PATCH_JUMP);
 
 	InjectHook(0x4A7B90, CRenderer::RenderOneRoad, PATCH_JUMP);
 	InjectHook(0x4A7BA0, CRenderer::RenderOneNonRoad, PATCH_JUMP);

src/render/Renderer.h

@@ -27,6 +27,7 @@ public:
 	static bool &m_loadingPriority;
 
 	static void Init(void);
+	static void Shutdown(void);
 	static void PreRender(void);
 
 	static void RenderRoads(void);