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 1ebf5dc49bc7dd34df1985ba391253abdea21246..7b6e366c6106ae1ac50bdee337a2c39372d75c37 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -48,6 +48,7 @@ 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");
@@ -108,12 +109,16 @@ void set_default_settings(Settings *settings)
        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");
@@ -130,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");
@@ -157,6 +163,7 @@ 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");
@@ -276,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
@@ -324,10 +332,10 @@ 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");
 #else
@@ -343,4 +351,3 @@ void override_default_settings(Settings *settings, Settings *from)
                settings->setDefault(name, from->get(name));
        }
 }
-