diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-06-07 03:31:06 +0200 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-06-07 03:31:06 +0200 |
| commit | 296cce39d33bf6dab2b41504321f18c2574f164b (patch) | |
| tree | d06e4a7788e2e976f02df4d618e3a6338ec5847e | |
| parent | b11c0a6721cd884d78b38b63797dfdb933004e03 (diff) | |
| download | dragonfireclient-296cce39d33bf6dab2b41504321f18c2574f164b.tar.xz | |
Fix upstream merge issues
| -rw-r--r-- | src/client/clientmap.cpp | 4 | ||||
| -rw-r--r-- | src/client/game.cpp | 2 | ||||
| -rw-r--r-- | src/client/game.h | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/client/clientmap.cpp b/src/client/clientmap.cpp index 3a89b8803..38ba1daad 100644 --- 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 888191f4a..e7840b189 100644 --- 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 0e5d0550d..1266874b5 100644 --- 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" |