Switch F3 to use 'enable_fog' setting

diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp
index 95d9fef718da716e4626d5686c4bacd1af7f045d..e465c018a13a8f0807f44b150d552be8238e184a 100644 (file)
--- a/src/client/inputhandler.cpp
+++ b/src/client/inputhandler.cpp
@@ -58,7 +58,7 @@ void KeyCache::populate()
        key[KeyType::SCREENSHOT] = getKeySetting("keymap_screenshot");
        key[KeyType::TOGGLE_HUD] = getKeySetting("keymap_toggle_hud");
        key[KeyType::TOGGLE_CHAT] = getKeySetting("keymap_toggle_chat");
-       key[KeyType::TOGGLE_FORCE_FOG_OFF] = getKeySetting("keymap_toggle_force_fog_off");
+       key[KeyType::TOGGLE_FOG] = getKeySetting("keymap_toggle_fog");
        key[KeyType::TOGGLE_UPDATE_CAMERA] = getKeySetting("keymap_toggle_update_camera");
        key[KeyType::TOGGLE_DEBUG] = getKeySetting("keymap_toggle_debug");
        key[KeyType::TOGGLE_PROFILER] = getKeySetting("keymap_toggle_profiler");

diff --git a/src/client/keys.h b/src/client/keys.h
index 9b8e50358d9816d6d179ac131c0dd16d7a8f1a91..e7ef5f4569d1accc1c24db1910500cd13dcb2d5b 100644 (file)
--- a/src/client/keys.h
+++ b/src/client/keys.h
@@ -58,7 +58,7 @@ public:
                SCREENSHOT,
                TOGGLE_HUD,
                TOGGLE_CHAT,
-               TOGGLE_FORCE_FOG_OFF,
+               TOGGLE_FOG,
                TOGGLE_UPDATE_CAMERA,
                TOGGLE_DEBUG,
                TOGGLE_PROFILER,

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index f6a28633b95755db37f162ca99ad24a00cbf88f3..0d1b3aa86c052c3f77280797d543e6a4a76e39ea 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -90,7 +90,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_cinematic", "");
        settings->setDefault("keymap_toggle_hud", "KEY_F1");
        settings->setDefault("keymap_toggle_chat", "KEY_F2");
-       settings->setDefault("keymap_toggle_force_fog_off", "KEY_F3");
+       settings->setDefault("keymap_toggle_fog", "KEY_F3");
 #if DEBUG
        settings->setDefault("keymap_toggle_update_camera", "KEY_F4");
 #else

diff --git a/src/game.cpp b/src/game.cpp
index 416b097fbd4a0670b55de5ad9dbf613d1fff6d8c..598be12d646691021dbb8183a9e7c86bb1e3c89b 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1915,7 +1915,7 @@ void Game::processKeyInput()
                toggleMinimap(isKeyDown(KeyType::SNEAK));
        } else if (wasKeyDown(KeyType::TOGGLE_CHAT)) {
                m_game_ui->toggleChat();
-       } else if (wasKeyDown(KeyType::TOGGLE_FORCE_FOG_OFF)) {
+       } else if (wasKeyDown(KeyType::TOGGLE_FOG)) {
                toggleFog();
        } else if (wasKeyDown(KeyType::TOGGLE_UPDATE_CAMERA)) {
                toggleUpdateCamera();
@@ -2204,8 +2204,9 @@ void Game::toggleMinimap(bool shift_pressed)
 
 void Game::toggleFog()
 {
-       m_flags.force_fog_off = !m_flags.force_fog_off;
-       if (m_flags.force_fog_off)
+       bool fog_enabled = g_settings->getBool("enable_fog");
+       g_settings->setBool("enable_fog", !fog_enabled);
+       if (fog_enabled)
                m_game_ui->showTranslatedStatusText("Fog disabled");
        else
                m_game_ui->showTranslatedStatusText("Fog enabled");
@@ -3672,8 +3673,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
                        camera_node_position.Z   = camera_node_position.Z + camera_offset.Z * BS;
                        clouds->update(camera_node_position,
                                        sky->getCloudColor());
-                       if (clouds->isCameraInsideCloud() && m_cache_enable_fog &&
-                                       !m_flags.force_fog_off) {
+                       if (clouds->isCameraInsideCloud() && m_cache_enable_fog) {
                                // if inside clouds, and fog enabled, use that as sky
                                // color(s)
                                video::SColor clouds_dark = clouds->getColor()
@@ -3698,7 +3698,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
                Fog
        */
 
-       if (m_cache_enable_fog && !m_flags.force_fog_off) {
+       if (m_cache_enable_fog) {
                driver->setFog(
                                sky->getBgColor(),
                                video::EFT_FOG_LINEAR,