From 95920d54f2b570bb0aa218ad574a51acdded6a4f Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Mon, 11 May 2020 17:04:08 +0200
Subject: [PATCH] random fixes

---
 src/core/Streaming.cpp  |  2 +-
 src/render/Renderer.cpp | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index f24192ef..e430f758 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -262,7 +262,7 @@ CStreaming::Init(void)
 		}
 	}
 #else
-	CStreaming::Init();
+	CStreaming::Init2();
 #endif
 }
 
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 714ff6e6..1f1e3b50 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -362,21 +362,19 @@ CRenderer::SetupEntityVisibility(CEntity *ent)
 					ent->bNoBrightHeadLights = false;
 				}
 				return VIS_OFFSCREEN;
-			}else{
-				// All sorts of Clumps
-				if(ent->m_rwObject == nil || !ent->bIsVisible)
-					return VIS_INVISIBLE;
-				if(!ent->GetIsOnScreen())
-					return VIS_OFFSCREEN;
-				if(ent->bDrawLast){
-					dist = (ent->GetPosition() - ms_vecCameraPosition).Magnitude();
-					CVisibilityPlugins::InsertEntityIntoSortedList(ent, dist);
-					ent->bDistanceFade = false;
-					return VIS_INVISIBLE;
-				}else
-					return VIS_VISIBLE;
 			}
-			return VIS_INVISIBLE;
+			// All sorts of Clumps
+			if(ent->m_rwObject == nil || !ent->bIsVisible)
+				return VIS_INVISIBLE;
+			if(!ent->GetIsOnScreen())
+				return VIS_OFFSCREEN;
+			if(ent->bDrawLast){
+				dist = (ent->GetPosition() - ms_vecCameraPosition).Magnitude();
+				CVisibilityPlugins::InsertEntityIntoSortedList(ent, dist);
+				ent->bDistanceFade = false;
+				return VIS_INVISIBLE;
+			}
+			return VIS_VISIBLE;
 		}
 		if(ent->IsObject() &&
 		   ((CObject*)ent)->ObjectCreatedBy == TEMP_OBJECT){
@@ -1196,8 +1194,10 @@ CRenderer::IsVehicleCullZoneVisible(CEntity *ent)
 void
 CRenderer::RemoveVehiclePedLights(CEntity *ent, bool reset)
 {
-	if(ent->bRenderScorched)
+	if(ent->bRenderScorched){
 		WorldReplaceScorchedLightsWithNormal(Scene.world);
+		return;
+	}
 	CPointLights::RemoveLightsAffectingObject();
 	if(reset)
 		ReSetAmbientAndDirectionalColours();