Formspec: Add options to set background color and opacity (fullscreen mode + default...

[dragonfireclient.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 54043cf75fbd8bc219edf33fb8d0440be6468ed5..2a3003f76ee2d2d6dc799d7394e039cedc2410d2 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -57,6 +57,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("curl_verify_cert", "true");
        settings->setDefault("enable_remote_media_server", "true");
        settings->setDefault("enable_client_modding", "false");
+       settings->setDefault("max_out_chat_queue_size", "20");
 
        // Keymap
        settings->setDefault("remote_port", "30000");
@@ -100,6 +101,39 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_screenshot", "KEY_F12");
        settings->setDefault("keymap_increase_viewing_range_min", "+");
        settings->setDefault("keymap_decrease_viewing_range_min", "-");
+       settings->setDefault("keymap_slot1", "KEY_KEY_1");
+       settings->setDefault("keymap_slot2", "KEY_KEY_2");
+       settings->setDefault("keymap_slot3", "KEY_KEY_3");
+       settings->setDefault("keymap_slot4", "KEY_KEY_4");
+       settings->setDefault("keymap_slot5", "KEY_KEY_5");
+       settings->setDefault("keymap_slot6", "KEY_KEY_6");
+       settings->setDefault("keymap_slot7", "KEY_KEY_7");
+       settings->setDefault("keymap_slot8", "KEY_KEY_8");
+       settings->setDefault("keymap_slot9", "KEY_KEY_9");
+       settings->setDefault("keymap_slot10", "KEY_KEY_0");
+       settings->setDefault("keymap_slot11", "");
+       settings->setDefault("keymap_slot12", "");
+       settings->setDefault("keymap_slot13", "");
+       settings->setDefault("keymap_slot14", "");
+       settings->setDefault("keymap_slot15", "");
+       settings->setDefault("keymap_slot16", "");
+       settings->setDefault("keymap_slot17", "");
+       settings->setDefault("keymap_slot18", "");
+       settings->setDefault("keymap_slot19", "");
+       settings->setDefault("keymap_slot20", "");
+       settings->setDefault("keymap_slot21", "");
+       settings->setDefault("keymap_slot22", "");
+       settings->setDefault("keymap_slot23", "");
+       settings->setDefault("enable_build_where_you_stand", "false" );
+       settings->setDefault("3d_mode", "none");
+       settings->setDefault("3d_paralax_strength", "0.025");
+       settings->setDefault("aux1_descends", "false");
+       settings->setDefault("doubletap_jump", "false");
+       settings->setDefault("always_fly_fast", "true");
+       settings->setDefault("directional_colored_fog", "true");
+       settings->setDefault("tooltip_show_delay", "400");
+       settings->setDefault("zoom_fov", "15");
+
        // Some (temporary) keys for debugging
        settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
        settings->setDefault("keymap_quicktune_prev", "KEY_HOME");
@@ -125,7 +159,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("pause_fps_max", "20");
        settings->setDefault("viewing_range", "100");
        settings->setDefault("screen_w", "1024");
-       settings->setDefault("screen_h", "576");
+       settings->setDefault("screen_h", "600");
        settings->setDefault("autosave_screensize", "true");
        settings->setDefault("fullscreen", "false");
        settings->setDefault("fullscreen_bpp", "24");
@@ -134,7 +168,9 @@ void set_default_settings(Settings *settings)
        settings->setDefault("leaves_style", "fancy");
        settings->setDefault("connected_glass", "false");
        settings->setDefault("smooth_lighting", "true");
-       settings->setDefault("display_gamma", "2.2");
+       settings->setDefault("lighting_alpha", "0.0");
+       settings->setDefault("lighting_beta", "0.0");
+       settings->setDefault("display_gamma", "1.0");
        settings->setDefault("texture_path", "");
        settings->setDefault("shader_path", "");
        settings->setDefault("video_driver", "opengl");
@@ -145,13 +181,16 @@ void set_default_settings(Settings *settings)
        settings->setDefault("view_bobbing_amount", "1.0");
        settings->setDefault("fall_bobbing_amount", "0.0");
        settings->setDefault("enable_3d_clouds", "true");
-       settings->setDefault("cloud_height", "120");
        settings->setDefault("cloud_radius", "12");
        settings->setDefault("menu_clouds", "true");
        settings->setDefault("opaque_water", "false");
        settings->setDefault("console_height", "1.0");
        settings->setDefault("console_color", "(0,0,0)");
        settings->setDefault("console_alpha", "200");
+       settings->setDefault("formspec_fullscreen_bg_color", "(0,0,0)");
+       settings->setDefault("formspec_fullscreen_bg_opacity", "140");
+       settings->setDefault("formspec_default_bg_color", "(0,0,0)");
+       settings->setDefault("formspec_default_bg_opacity", "140");
        settings->setDefault("selectionbox_color", "(0,0,0)");
        settings->setDefault("selectionbox_width", "2");
        settings->setDefault("node_highlighting", "box");
@@ -205,6 +244,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("invert_mouse", "false");
        settings->setDefault("mouse_sensitivity", "0.2");
        settings->setDefault("repeat_rightclick_time", "0.25");
+       settings->setDefault("safe_dig_and_place", "false");
        settings->setDefault("random_input", "false");
        settings->setDefault("aux1_descends", "false");
        settings->setDefault("doubletap_jump", "false");
@@ -254,7 +294,6 @@ void set_default_settings(Settings *settings)
        // Network
        settings->setDefault("enable_ipv6", "true");
        settings->setDefault("ipv6_server", "false");
-       settings->setDefault("workaround_window_size","5");
        settings->setDefault("max_packets_per_iteration","1024");
        settings->setDefault("port", "30000");
        settings->setDefault("strict_protocol_version_checking", "false");
@@ -293,6 +332,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("max_block_send_distance", "9");
        settings->setDefault("block_send_optimize_distance", "4");
        settings->setDefault("server_side_occlusion_culling", "true");
+       settings->setDefault("csm_flavour_limits", "3");
+       settings->setDefault("csm_flavour_noderange_limit", "8");
        settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096");
        settings->setDefault("time_speed", "72");
        settings->setDefault("server_unload_unused_data_timeout", "29");
@@ -303,7 +344,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("chat_message_limit_trigger_kick", "50");
        settings->setDefault("sqlite_synchronous", "2");
        settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
-       settings->setDefault("dedicated_server_step", "0.1");
+       settings->setDefault("dedicated_server_step", "0.09");
        settings->setDefault("active_block_mgmt_interval", "2.0");
        settings->setDefault("abm_interval", "1.0");
        settings->setDefault("nodetimer_interval", "0.2");
@@ -403,8 +444,7 @@ void set_default_settings(Settings *settings)
 void override_default_settings(Settings *settings, Settings *from)
 {
        std::vector<std::string> names = from->getNames();
-       for (size_t i = 0; i < names.size(); i++) {
-               const std::string &name = names[i];
+       for (const auto &name : names) {
                settings->setDefault(name, from->get(name));
        }
 }