Use std::queue for HTTPFetchRequest and std::vector for log_output instead of std...

[oweals/minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index ccde6b5779339f5246f2a00fb7157ea0ce80bcce..7b6e366c6106ae1ac50bdee337a2c39372d75c37 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -48,16 +48,23 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_freemove", "KEY_KEY_K");
        settings->setDefault("keymap_fastmove", "KEY_KEY_J");
        settings->setDefault("keymap_noclip", "KEY_KEY_H");
+       settings->setDefault("keymap_cinematic", "KEY_F8");
        settings->setDefault("keymap_screenshot", "KEY_F12");
        settings->setDefault("keymap_toggle_hud", "KEY_F1");
        settings->setDefault("keymap_toggle_chat", "KEY_F2");
        settings->setDefault("keymap_toggle_force_fog_off", "KEY_F3");
-       settings->setDefault("keymap_toggle_update_camera", "KEY_F4");
+       settings->setDefault("keymap_toggle_update_camera",
+#if DEBUG
+                       "KEY_F4");
+#else
+                       "none");
+#endif
        settings->setDefault("keymap_toggle_debug", "KEY_F5");
        settings->setDefault("keymap_toggle_profiler", "KEY_F6");
        settings->setDefault("keymap_camera_mode", "KEY_F7");
        settings->setDefault("keymap_increase_viewing_range_min", "+");
        settings->setDefault("keymap_decrease_viewing_range_min", "-");
+       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");
@@ -100,13 +107,18 @@ void set_default_settings(Settings *settings)
        settings->setDefault("view_bobbing", "true");
        settings->setDefault("new_style_water", "false");
        settings->setDefault("new_style_leaves", "true");
+       settings->setDefault("connected_glass", "false");
        settings->setDefault("smooth_lighting", "true");
+       settings->setDefault("display_gamma", "1.8");
        settings->setDefault("texture_path", "");
        settings->setDefault("shader_path", "");
        settings->setDefault("video_driver", "opengl");
        settings->setDefault("free_move", "false");
        settings->setDefault("noclip", "false");
        settings->setDefault("continuous_forward", "false");
+       settings->setDefault("cinematic", "false");
+       settings->setDefault("camera_smoothing", "0");
+       settings->setDefault("cinematic_camera_smoothing", "0.7");
        settings->setDefault("fast_move", "false");
        settings->setDefault("invert_mouse", "false");
        settings->setDefault("enable_clouds", "true");
@@ -123,6 +135,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_node_highlighting", "false");
        settings->setDefault("crosshair_color", "(255,255,255)");
        settings->setDefault("crosshair_alpha", "255");
+       settings->setDefault("hud_scaling", "1.0");
        settings->setDefault("gui_scaling", "1.0");
        settings->setDefault("mouse_sensitivity", "0.2");
        settings->setDefault("enable_sound", "true");
@@ -130,6 +143,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("desynchronize_mapblock_texture_animation", "true");
        settings->setDefault("selectionbox_width","2");
        settings->setDefault("hud_hotbar_max_width","1.0");
+       settings->setDefault("enable_local_map_saving", "false");
 
        settings->setDefault("mip_map", "false");
        settings->setDefault("anisotropic_filter", "false");
@@ -149,9 +163,11 @@ void set_default_settings(Settings *settings)
        settings->setDefault("water_wave_speed", "5.0");
        settings->setDefault("enable_waving_leaves", "false");
        settings->setDefault("enable_waving_plants", "false");
+       settings->setDefault("ambient_occlusion_gamma", "2.2");
        settings->setDefault("enable_shaders", "true");
        settings->setDefault("repeat_rightclick_time", "0.25");
        settings->setDefault("enable_particles", "true");
+       settings->setDefault("enable_mesh_cache", "true");
 
        settings->setDefault("curl_timeout", "5000");
        settings->setDefault("curl_parallel_limit", "8");
@@ -178,10 +194,23 @@ void set_default_settings(Settings *settings)
 
        settings->setDefault("fallback_font_shadow", "1");
        settings->setDefault("fallback_font_shadow_alpha", "128");
+
+       std::stringstream fontsize;
+       fontsize << TTF_DEFAULT_FONT_SIZE;
+
+       settings->setDefault("font_size", fontsize.str());
+       settings->setDefault("mono_font_size", fontsize.str());
+       settings->setDefault("fallback_font_size", fontsize.str());
 #else
        settings->setDefault("freetype", "false");
-       settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "fontlucida.png"));
-       settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "fontdejavusansmono.png"));
+       settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "lucida_sans"));
+       settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "mono_dejavu_sans"));
+
+       std::stringstream fontsize;
+       fontsize << DEFAULT_FONT_SIZE;
+
+       settings->setDefault("font_size", fontsize.str());
+       settings->setDefault("mono_font_size", fontsize.str());
 #endif
 
        // Server stuff
@@ -196,12 +225,11 @@ void set_default_settings(Settings *settings)
        settings->setDefault("strict_protocol_version_checking", "false");
        settings->setDefault("creative_mode", "false");
        settings->setDefault("enable_damage", "true");
-       settings->setDefault("only_peaceful_mobs", "false");
        settings->setDefault("fixed_map_seed", "");
        settings->setDefault("give_initial_stuff", "false");
        settings->setDefault("default_password", "");
        settings->setDefault("default_privs", "interact, shout");
-       settings->setDefault("unlimited_player_transfer_distance", "true");
+       settings->setDefault("player_transfer_distance", "0");
        settings->setDefault("enable_pvp", "true");
        settings->setDefault("disallow_empty_password", "false");
        settings->setDefault("disable_anticheat", "false");
@@ -255,7 +283,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("movement_gravity", "9.81");
 
        //liquid stuff
-       settings->setDefault("liquid_loop_max", "10000");
+       settings->setDefault("liquid_loop_max", "100000");
+       settings->setDefault("liquid_queue_purge_time", "0");
        settings->setDefault("liquid_update", "1.0");
 
        //mapgen stuff
@@ -287,7 +316,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_particles", "false");
        settings->setDefault("video_driver", "ogles1");
        settings->setDefault("touchtarget", "true");
-       settings->setDefault("main_menu_script","/sdcard/Minetest/builtin/mainmenu/init_android.lua");
        settings->setDefault("TMPFolder","/sdcard/Minetest/tmp/");
        settings->setDefault("touchscreen_threshold","20");
        settings->setDefault("smooth_lighting", "false");
@@ -304,28 +332,14 @@ void set_default_settings(Settings *settings)
        float x_inches = ((double) porting::getDisplaySize().X /
                        (160 * porting::getDisplayDensity()));
        if (x_inches  < 3.5) {
-               settings->setDefault("gui_scaling", "0.6");
+               settings->setDefault("hud_scaling", "0.6");
        }
        else if (x_inches < 4.5) {
-               settings->setDefault("gui_scaling", "0.7");
+               settings->setDefault("hud_scaling", "0.7");
        }
        settings->setDefault("curl_verify_cert","false");
-#endif
-}
-
-void late_init_default_settings(Settings* settings)
-{
-#ifndef SERVER
-       std::stringstream fontsize;
-       fontsize << floor(
-                       DEFAULT_FONT_SIZE *
-                       porting::getDisplayDensity() *
-                       settings->getFloat("gui_scaling")
-                       );
-
-       settings->setDefault("font_size", fontsize.str());
-       settings->setDefault("mono_font_size", fontsize.str());
-       settings->setDefault("fallback_font_size", fontsize.str());
+#else
+       settings->setDefault("screen_dpi", "72");
 #endif
 }
 
@@ -337,4 +351,3 @@ void override_default_settings(Settings *settings, Settings *from)
                settings->setDefault(name, from->get(name));
        }
 }
-