Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / player.cpp

diff --git a/src/player.cpp b/src/player.cpp
index 1e064c1dac557d43c92ab9663c9d552f4c3f8e7b..789d852eab325c12e09083ae77458d387190552a 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -220,13 +220,14 @@ void PlayerControl::unpackKeysPressed(u32 keypress_bits)
 
 void PlayerSettings::readGlobalSettings()
 {
-       free_move = g_settings->getBool("free_move");
+       freecam = g_settings->getBool("freecam");
+       free_move = g_settings->getBool("free_move") || freecam;
        pitch_move = g_settings->getBool("pitch_move");
-       fast_move = g_settings->getBool("fast_move");
+       fast_move = g_settings->getBool("fast_move") || freecam;
        continuous_forward = g_settings->getBool("continuous_forward");
-       always_fly_fast = g_settings->getBool("always_fly_fast");
+       always_fly_fast = g_settings->getBool("always_fly_fast") || freecam;
        aux1_descends = g_settings->getBool("aux1_descends");
-       noclip = g_settings->getBool("noclip");
+       noclip = g_settings->getBool("noclip") || freecam;
        autojump = g_settings->getBool("autojump");
 }