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 /src/client/game.cpp | |
| parent | b11c0a6721cd884d78b38b63797dfdb933004e03 (diff) | |
| download | dragonfireclient-296cce39d33bf6dab2b41504321f18c2574f164b.tar.xz | |
Fix upstream merge issues
Diffstat (limited to 'src/client/game.cpp')
| -rw-r--r-- | src/client/game.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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, |