Fix enable_fog = false not having any effect when shaders are enabled

This commit is contained in:
Kahrl 2013-09-03 13:21:04 +02:00
parent e61b1773c9
commit 1ad9365d34

@ -794,9 +794,9 @@ public:
services->setPixelShaderConstant("skyBgColor", bgcolorfa, 4); services->setPixelShaderConstant("skyBgColor", bgcolorfa, 4);
// Fog distance // Fog distance
float fog_distance = *m_fog_range; float fog_distance = 10000*BS;
if(*m_force_fog_off) if(g_settings->getBool("enable_fog") && !*m_force_fog_off)
fog_distance = 10000*BS; fog_distance = *m_fog_range;
services->setPixelShaderConstant("fogDistance", &fog_distance, 1); services->setPixelShaderConstant("fogDistance", &fog_distance, 1);
// Day-night ratio // Day-night ratio
@ -2928,7 +2928,7 @@ void the_game(
Fog Fog
*/ */
if(g_settings->getBool("enable_fog") == true && !force_fog_off) if(g_settings->getBool("enable_fog") && !force_fog_off)
{ {
driver->setFog( driver->setFog(
bgcolor, bgcolor,