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

[dragonfireclient.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index c7d79ff3abe890534e3ab44216479f57269833c0..23e06ab0514f5ea7b1a5d033804408789772b4d7 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -347,6 +347,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("joystick_type", "");
        settings->setDefault("repeat_joystick_button_time", "0.17");
        settings->setDefault("joystick_frustum_sensitivity", "170");
+       settings->setDefault("joystick_deadzone", "2048");
 
        // Main menu
        settings->setDefault("main_menu_path", "");
@@ -453,6 +454,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("chat_message_limit_per_10sec", "8.0");
        settings->setDefault("chat_message_limit_trigger_kick", "50");
        settings->setDefault("sqlite_synchronous", "2");
+       settings->setDefault("map_compression_level_disk", "3");
+       settings->setDefault("map_compression_level_net", "-1");
        settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
        settings->setDefault("dedicated_server_step", "0.09");
        settings->setDefault("active_block_mgmt_interval", "2.0");
@@ -538,6 +541,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("fps_max_unfocused", "10");
        settings->setDefault("max_objects_per_block", "20");
        settings->setDefault("sqlite_synchronous", "1");
+       settings->setDefault("map_compression_level_disk", "-1");
+       settings->setDefault("map_compression_level_net", "3");
        settings->setDefault("server_map_save_interval", "15");
        settings->setDefault("client_mapblock_limit", "1000");
        settings->setDefault("active_block_range", "2");