* refactored liquid transformation code (has some flaws)

[minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 6fcdc1dbb30c006f8fbedf29c10c99e3c5188640..cbc78ad3f51a70773a17658618fa0e32d5728812 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -40,6 +40,10 @@ void set_default_settings()
        g_settings.setDefault("keymap_inventory", "KEY_KEY_I");
        g_settings.setDefault("keymap_chat", "KEY_KEY_T");
        g_settings.setDefault("keymap_rangeselect", "KEY_KEY_R");
+       g_settings.setDefault("keymap_freemove", "KEY_KEY_K");
+       g_settings.setDefault("keymap_fastmove", "KEY_KEY_J");
+       g_settings.setDefault("keymap_frametime_graph", "KEY_F1");
+       g_settings.setDefault("keymap_screenshot", "KEY_F12");
        // Some (temporary) keys for debugging
        g_settings.setDefault("keymap_special1", "KEY_KEY_E");
        g_settings.setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
@@ -47,12 +51,12 @@ void set_default_settings()
        g_settings.setDefault("wanted_fps", "30");
        g_settings.setDefault("fps_max", "60");
        g_settings.setDefault("viewing_range_nodes_max", "300");
-       g_settings.setDefault("viewing_range_nodes_min", "35");
+       g_settings.setDefault("viewing_range_nodes_min", "25");
        g_settings.setDefault("screenW", "800");
        g_settings.setDefault("screenH", "600");
        g_settings.setDefault("address", "");
        g_settings.setDefault("random_input", "false");
-       g_settings.setDefault("client_delete_unused_sectors_timeout", "1200");
+       g_settings.setDefault("client_unload_unused_data_timeout", "600");
        g_settings.setDefault("enable_fog", "true");
        g_settings.setDefault("new_style_water", "false");
        g_settings.setDefault("new_style_leaves", "true");
@@ -61,11 +65,16 @@ void set_default_settings()
        g_settings.setDefault("enable_texture_atlas", "true");
        g_settings.setDefault("texture_path", "");
        g_settings.setDefault("video_driver", "opengl");
-       
        g_settings.setDefault("free_move", "false");
        g_settings.setDefault("continuous_forward", "false");
        g_settings.setDefault("fast_move", "false");
        g_settings.setDefault("invert_mouse", "false");
+       g_settings.setDefault("enable_farmesh", "false");
+       g_settings.setDefault("farmesh_trees", "true");
+       g_settings.setDefault("farmesh_distance", "40");
+       g_settings.setDefault("enable_clouds", "true");
+       g_settings.setDefault("invisible_stone", "false");
+       g_settings.setDefault("screenshot_path", ".");
 
        // Server stuff
        g_settings.setDefault("enable_experimental", "false");
@@ -74,18 +83,22 @@ void set_default_settings()
        g_settings.setDefault("give_initial_stuff", "false");
        g_settings.setDefault("default_password", "");
        g_settings.setDefault("default_privs", "build, shout");
+       g_settings.setDefault("profiler_print_interval", "0");
+       g_settings.setDefault("enable_mapgen_debug_info", "false");
 
        g_settings.setDefault("objectdata_interval", "0.2");
        g_settings.setDefault("active_object_range", "2");
-       g_settings.setDefault("max_simultaneous_block_sends_per_client", "1");
-       //g_settings.setDefault("max_simultaneous_block_sends_per_client", "2");
-       g_settings.setDefault("max_simultaneous_block_sends_server_total", "4");
+       //g_settings.setDefault("max_simultaneous_block_sends_per_client", "1");
+       // This causes frametime jitter on client side, or does it?
+       g_settings.setDefault("max_simultaneous_block_sends_per_client", "2");
+       g_settings.setDefault("max_simultaneous_block_sends_server_total", "8");
        g_settings.setDefault("max_block_send_distance", "8");
        g_settings.setDefault("max_block_generate_distance", "8");
        g_settings.setDefault("time_send_interval", "20");
        g_settings.setDefault("time_speed", "96");
-       g_settings.setDefault("server_unload_unused_sectors_timeout", "60");
+       g_settings.setDefault("server_unload_unused_data_timeout", "60");
        g_settings.setDefault("server_map_save_interval", "60");
        g_settings.setDefault("full_block_send_enable_min_time_from_building", "2.0");
+       //g_settings.setDefault("dungeon_rarity", "0.025");
 }