From c556cbbbe016858537ebc2950e2803bcb85f93d5 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Tue, 18 Aug 2020 10:58:15 +0200
Subject: neo pipelines

---
 src/rw/Lights.h              | 6 ++++++
 src/rw/VisibilityPlugins.cpp | 5 +++++
 2 files changed, 11 insertions(+)

(limited to 'src/rw')

diff --git a/src/rw/Lights.h b/src/rw/Lights.h
index 6fdd51de..b296816b 100644
--- a/src/rw/Lights.h
+++ b/src/rw/Lights.h
@@ -1,5 +1,11 @@
 #pragma once
 
+extern RpLight *pAmbient;
+extern RpLight *pDirect;
+extern RpLight *pExtraDirectionals[4];
+extern int LightStrengths[4];
+extern int NumExtraDirLightsInWorld;
+
 void SetLightsWithTimeOfDayColour(RpWorld *);
 RpWorld *LightsCreate(RpWorld *world);
 void LightsDestroy(RpWorld *world);
diff --git a/src/rw/VisibilityPlugins.cpp b/src/rw/VisibilityPlugins.cpp
index f6a9c3b5..b2e252a0 100644
--- a/src/rw/VisibilityPlugins.cpp
+++ b/src/rw/VisibilityPlugins.cpp
@@ -8,6 +8,7 @@
 #include "Camera.h"
 #include "VisibilityPlugins.h"
 #include "World.h"
+#include "custompipes.h"
 
 #define FADE_DISTANCE 20.0f
 
@@ -146,6 +147,10 @@ CVisibilityPlugins::RenderFadingEntities(void)
 		CEntity *e = node->item.entity;
 		if(e->m_rwObject == nil)
 			continue;
+#ifdef EXTENDED_PIPELINES
+		if(CustomPipes::bRenderingEnvMap && (e->IsPed() || e->IsVehicle()))
+			continue;
+#endif
 		mi = (CSimpleModelInfo *)CModelInfo::GetModelInfo(e->GetModelIndex());
 #ifdef FIX_BUGS
 		if(mi->GetModelType() == MITYPE_SIMPLE && mi->m_noZwrite)
-- 
cgit v1.2.3