Remove ClientMap::m_camera_mutex

[minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 669987d0031471611b4f95a7ef934b8baacd1004..9578579765d59767eaad9aef05ed959bb2cc560a 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -137,8 +137,9 @@ void set_default_settings(Settings *settings)
        settings->setDefault("console_color", "(0,0,0)");
        settings->setDefault("console_alpha", "200");
        settings->setDefault("selectionbox_color", "(0,0,0)");
-       settings->setDefault("enable_node_highlighting", "false");
+       settings->setDefault("selectionbox_width", "2");
        settings->setDefault("inventory_items_animations", "false");
+       settings->setDefault("node_highlighting", "box");
        settings->setDefault("crosshair_color", "(255,255,255)");
        settings->setDefault("crosshair_alpha", "255");
        settings->setDefault("hud_scaling", "1.0");
@@ -149,8 +150,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_sound", "true");
        settings->setDefault("sound_volume", "0.8");
        settings->setDefault("desynchronize_mapblock_texture_animation", "true");
-       settings->setDefault("selectionbox_width","2");
-       settings->setDefault("hud_hotbar_max_width","1.0");
+       settings->setDefault("hud_hotbar_max_width", "1.0");
        settings->setDefault("enable_local_map_saving", "false");
 
        settings->setDefault("mip_map", "false");
@@ -247,7 +247,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("default_privs", "interact, shout");
        settings->setDefault("player_transfer_distance", "0");
        settings->setDefault("enable_pvp", "true");
-       settings->setDefault("vertical_spawn_range", "16");
        settings->setDefault("disallow_empty_password", "false");
        settings->setDefault("disable_anticheat", "false");
        settings->setDefault("enable_rollback_recording", "false");