Fix upstream merge issues

[dragonfireclient.git] / src / client / game.cpp

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,