From 1ad9365d34bbc4af1b712c77692fd027ebd4b586 Mon Sep 17 00:00:00 2001 From: Kahrl Date: Tue, 3 Sep 2013 13:21:04 +0200 Subject: [PATCH] Fix enable_fog = false not having any effect when shaders are enabled --- src/game.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 650b5e2f8..d3d49d7b4 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -794,9 +794,9 @@ public: services->setPixelShaderConstant("skyBgColor", bgcolorfa, 4); // Fog distance - float fog_distance = *m_fog_range; - if(*m_force_fog_off) - fog_distance = 10000*BS; + float fog_distance = 10000*BS; + if(g_settings->getBool("enable_fog") && !*m_force_fog_off) + fog_distance = *m_fog_range; services->setPixelShaderConstant("fogDistance", &fog_distance, 1); // Day-night ratio @@ -2928,7 +2928,7 @@ void the_game( Fog */ - if(g_settings->getBool("enable_fog") == true && !force_fog_off) + if(g_settings->getBool("enable_fog") && !force_fog_off) { driver->setFog( bgcolor,