Allow NodeTimer, ABM and block mgmt interval changes.

[minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index ddd7b5fe12f15f2001686ee3eba8ef882f2cc1fb..e00ff14898b3cef97700ff3e376b049b37efaef3 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -89,12 +89,9 @@ void set_default_settings(Settings *settings)
        settings->setDefault("show_debug", "true");
        #endif
 
-       settings->setDefault("wanted_fps", "30");
        settings->setDefault("fps_max", "60");
        settings->setDefault("pause_fps_max", "20");
-       // A bit more than the server will send around the player, to make fog blend well
-       settings->setDefault("viewing_range_nodes_max", "240");
-       settings->setDefault("viewing_range_nodes_min", "35");
+       settings->setDefault("viewing_range", "100");
        settings->setDefault("map_generation_limit", "31000");
        settings->setDefault("screenW", "800");
        settings->setDefault("screenH", "600");
@@ -109,7 +106,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_fog", "true");
        settings->setDefault("fov", "72");
        settings->setDefault("view_bobbing", "true");
-       settings->setDefault("new_style_water", "false");
        settings->setDefault("leaves_style", "fancy");
        settings->setDefault("connected_glass", "false");
        settings->setDefault("smooth_lighting", "true");
@@ -127,6 +123,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("invert_mouse", "false");
        settings->setDefault("enable_clouds", "true");
        settings->setDefault("screenshot_path", ".");
+       settings->setDefault("screenshot_format", "png");
+       settings->setDefault("screenshot_quality", "0");
        settings->setDefault("view_bobbing_amount", "1.0");
        settings->setDefault("fall_bobbing_amount", "0.0");
        settings->setDefault("enable_3d_clouds", "true");
@@ -159,7 +157,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("trilinear_filter", "false");
        settings->setDefault("texture_clean_transparent", "false");
        settings->setDefault("texture_min_size", "64");
-       settings->setDefault("preload_item_visuals", "false");
+       settings->setDefault("tone_mapping", "false");
        settings->setDefault("enable_bumpmapping", "false");
        settings->setDefault("enable_parallax_occlusion", "false");
        settings->setDefault("generate_normalmaps", "false");
@@ -180,11 +178,14 @@ void set_default_settings(Settings *settings)
        settings->setDefault("repeat_rightclick_time", "0.25");
        settings->setDefault("enable_particles", "true");
        settings->setDefault("enable_mesh_cache", "false");
-
+       settings->setDefault("enable_vbo", "true");
+       
        settings->setDefault("enable_minimap", "true");
        settings->setDefault("minimap_shape_round", "true");
        settings->setDefault("minimap_double_scan_height", "true");
 
+       settings->setDefault("send_pre_v25_init", "true");
+
        settings->setDefault("curl_timeout", "5000");
        settings->setDefault("curl_parallel_limit", "8");
        settings->setDefault("curl_file_download_timeout", "300000");
@@ -247,7 +248,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");
@@ -280,6 +280,9 @@ void set_default_settings(Settings *settings)
        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("active_block_mgmt_interval", "2.0");
+       settings->setDefault("abm_interval", "1.0");
+       settings->setDefault("nodetimer_interval", "1.0");
        settings->setDefault("ignore_world_load_errors", "false");
        settings->setDefault("remote_media", "");
        settings->setDefault("debug_log_level", "action");
@@ -289,6 +292,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("num_emerge_threads", "1");
        settings->setDefault("secure.enable_security", "false");
        settings->setDefault("secure.trusted_mods", "");
+       settings->setDefault("secure.http_mods", "");
 
        // physics stuff
        settings->setDefault("movement_acceleration_default", "3");
@@ -345,10 +349,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("max_simultaneous_block_sends_per_client", "3");
        settings->setDefault("emergequeue_limit_diskonly", "8");
        settings->setDefault("emergequeue_limit_generate", "8");
-       settings->setDefault("preload_item_visuals", "false");
 
-       settings->setDefault("viewing_range_nodes_max", "50");
-       settings->setDefault("viewing_range_nodes_min", "20");
+       settings->setDefault("viewing_range", "50");
        settings->setDefault("inventory_image_hack", "false");
 
        //check for device with small screen