From 0662de53234d331663d74c85e56d4c21633c2503 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Wed, 4 Nov 2020 22:45:01 +0100
Subject: [PATCH] fixed vehicle and ped sorting for new renderer

---
 src/render/Renderer.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 01600c0d..58311574 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -818,6 +818,8 @@ CRenderer::RenderVehiclesAndPeds(void)
 {
 	int i;
 	CEntity *e;
+	EntityInfo ei;
+	CLink<EntityInfo> *node;
 
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE);
 	//CVisibilityPlugins::InitAlphaEntityList();	// not safe yet
@@ -826,9 +828,21 @@ CRenderer::RenderVehiclesAndPeds(void)
 	for(i = 0; i < ms_nNoOfVisibleVehicles; i++){
 		e = ms_aVisibleVehiclePtrs[i];
 		if(e->IsVehicle() && PutIntoSortedVehicleList((CVehicle*)e))
-			continue;
-		RenderOneNonRoad(e);
+			continue;	// boats handled elsewhere
+		if(e->IsPed())
+			RenderOneNonRoad(e);
+		else{
+			ei.ent = e;
+			ei.sort = (ms_vecCameraPosition - e->GetPosition()).MagnitudeSqr();
+			gSortedVehiclesAndPeds.InsertSorted(ei);
+		}
 	}
+
+	for(node = gSortedVehiclesAndPeds.tail.prev;
+	    node != &gSortedVehiclesAndPeds.head;
+	    node = node->prev)
+		RenderOneNonRoad(node->item.ent);
+
 //	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
 }