summaryrefslogtreecommitdiffstats
path: root/src/rw
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-08-18 10:58:15 +0200
committeraap <aap@papnet.eu>2020-08-18 10:58:15 +0200
commitc556cbbbe016858537ebc2950e2803bcb85f93d5 (patch)
treeb301c8f091840a378b82b27806546a28abd6d221 /src/rw
parentMove stuff to vendor (diff)
downloadre3-c556cbbbe016858537ebc2950e2803bcb85f93d5.tar
re3-c556cbbbe016858537ebc2950e2803bcb85f93d5.tar.gz
re3-c556cbbbe016858537ebc2950e2803bcb85f93d5.tar.bz2
re3-c556cbbbe016858537ebc2950e2803bcb85f93d5.tar.lz
re3-c556cbbbe016858537ebc2950e2803bcb85f93d5.tar.xz
re3-c556cbbbe016858537ebc2950e2803bcb85f93d5.tar.zst
re3-c556cbbbe016858537ebc2950e2803bcb85f93d5.zip
Diffstat (limited to 'src/rw')
-rw-r--r--src/rw/Lights.h6
-rw-r--r--src/rw/VisibilityPlugins.cpp5
2 files changed, 11 insertions, 0 deletions
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)