Fix upstream merge issues

diff --git a/src/client/clientmap.cpp b/src/client/clientmap.cpp
index 3a89b88038b638058d44935eb2334448d7cd1ac9..38ba1daad2df308e0df0a8a6a09e2c259722c0cf 100644 (file)
--- a/src/client/clientmap.cpp
+++ b/src/client/clientmap.cpp
@@ -221,7 +221,7 @@ void ClientMap::updateDrawList()
 
        // No occlusion culling when free_move is on and camera is inside ground
        bool occlusion_culling_enabled = true;
-       if (m_control.allow_noclip || g_settings->getBool("freecam")) {
+       if (m_control.allow_noclip) {
                MapNode n = getNode(cam_pos_nodes);
                if (n.getContent() == CONTENT_IGNORE || m_nodedef->get(n).solidness == 2)
                        occlusion_culling_enabled = false;
@@ -682,7 +682,7 @@ void ClientMap::renderPostFx(CameraMode cam_mode)
        // If the camera is in a solid node, make everything black.
        // (first person mode only)
        if (features.solidness == 2 && cam_mode == CAMERA_MODE_FIRST &&
-               !(m_control.allow_noclip || g_settings->getBool("freecam"))) {
+               !m_control.allow_noclip) {
                post_effect_color = video::SColor(255, 0, 0, 0);
        }
 

diff --git a/src/client/game.cpp b/src/client/game.cpp
index 888191f4a406ad39ddf7402e0474bea7783d0b64..e7840b1892e548607d28d872d50e32a2a325c1d3 100644 (file)
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -944,7 +944,7 @@ void Game::updateDebugState()
                draw_control->show_wireframe = false;
 
        // noclip
-       draw_control->allow_noclip = m_cache_enable_noclip && client->checkPrivilege("noclip");
+       draw_control->allow_noclip = (m_cache_enable_noclip && client->checkPrivilege("noclip")) || g_settings->getBool("freecam");
 }
 
 void Game::updateProfilers(const RunStats &stats, const FpsControl &draw_times,

diff --git a/src/client/game.h b/src/client/game.h
index 0e5d0550d296b156acd1652b7bfcf205197b5a95..1266874b53d5c8395648da942be2183aa56bd5ab 100644 (file)
--- a/src/client/game.h
+++ b/src/client/game.h
@@ -43,7 +43,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gettext.h"
 #include "gui/cheatMenu.h"
 #include "gui/guiChatConsole.h"
-#include "gui/guiConfirmRegistration.h"
 #include "gui/guiFormSpecMenu.h"
 #include "gui/guiKeyChangeMenu.h"
 #include "gui/guiPasswordChange.h"