summaryrefslogtreecommitdiffstats
path: root/src/rw/Lights.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-08-11 18:39:53 +0200
committeraap <aap@papnet.eu>2020-08-11 18:40:04 +0200
commitb468d010a8a185bd04cdb1fb41810a189971e583 (patch)
tree8eda0c65a57dd11653252fcca2bbbd64c9343b5c /src/rw/Lights.cpp
parentMerge pull request #683 from majesticCoding/miami (diff)
downloadre3-b468d010a8a185bd04cdb1fb41810a189971e583.tar
re3-b468d010a8a185bd04cdb1fb41810a189971e583.tar.gz
re3-b468d010a8a185bd04cdb1fb41810a189971e583.tar.bz2
re3-b468d010a8a185bd04cdb1fb41810a189971e583.tar.lz
re3-b468d010a8a185bd04cdb1fb41810a189971e583.tar.xz
re3-b468d010a8a185bd04cdb1fb41810a189971e583.tar.zst
re3-b468d010a8a185bd04cdb1fb41810a189971e583.zip
Diffstat (limited to 'src/rw/Lights.cpp')
-rw-r--r--src/rw/Lights.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/rw/Lights.cpp b/src/rw/Lights.cpp
index cd45b81f..c5038232 100644
--- a/src/rw/Lights.cpp
+++ b/src/rw/Lights.cpp
@@ -23,6 +23,13 @@ RwRGBAReal DirectionalLightColourForFrame;
RwRGBAReal AmbientLightColour;
RwRGBAReal DirectionalLightColour;
+#ifdef EXTENDED_COLOURFILTER
+#include "postfx.h"
+#define USEBLURCOLORS CPostFX::UseBlurColours()
+#else
+#define USEBLURCOLORS CMBlur::BlurOn
+#endif
+
//--MIAMI: done
void
SetLightsWithTimeOfDayColour(RpWorld *)
@@ -31,7 +38,7 @@ SetLightsWithTimeOfDayColour(RpWorld *)
RwMatrix mat;
if(pAmbient){
- if(CMBlur::BlurOn){
+ if(USEBLURCOLORS){
AmbientLightColourForFrame.red = CTimeCycle::GetAmbientRed_Bl() * CCoronas::LightsMult;
AmbientLightColourForFrame.green = CTimeCycle::GetAmbientGreen_Bl() * CCoronas::LightsMult;
AmbientLightColourForFrame.blue = CTimeCycle::GetAmbientBlue_Bl() * CCoronas::LightsMult;
@@ -41,7 +48,7 @@ SetLightsWithTimeOfDayColour(RpWorld *)
AmbientLightColourForFrame.blue = CTimeCycle::GetAmbientBlue() * CCoronas::LightsMult;
}
- if(CMBlur::BlurOn){
+ if(USEBLURCOLORS){
AmbientLightColourForFrame_PedsCarsAndObjects.red = CTimeCycle::GetAmbientRed_Obj_Bl() * CCoronas::LightsMult;
AmbientLightColourForFrame_PedsCarsAndObjects.green = CTimeCycle::GetAmbientGreen_Obj_Bl() * CCoronas::LightsMult;
AmbientLightColourForFrame_PedsCarsAndObjects.blue = CTimeCycle::GetAmbientBlue_Obj_Bl() * CCoronas::LightsMult;