Raise PROTOCOL_VERSION to 9, as this is not compatible with earlier versions

[minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 8429ff22cba04583bedf085c26e0a503c92a35fa..5d4c969e3cc8e80ebd97813e11050aec82094032 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -35,24 +35,43 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_right", "KEY_KEY_D");
        settings->setDefault("keymap_jump", "KEY_SPACE");
        settings->setDefault("keymap_sneak", "KEY_LSHIFT");
+       settings->setDefault("keymap_drop", "KEY_KEY_Q");
        settings->setDefault("keymap_inventory", "KEY_KEY_I");
        settings->setDefault("keymap_special1", "KEY_KEY_E");
        settings->setDefault("keymap_chat", "KEY_KEY_T");
        settings->setDefault("keymap_cmd", "/");
+       settings->setDefault("keymap_console", "KEY_F10");
        settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
        settings->setDefault("keymap_freemove", "KEY_KEY_K");
        settings->setDefault("keymap_fastmove", "KEY_KEY_J");
-       settings->setDefault("keymap_frametime_graph", "KEY_F1");
        settings->setDefault("keymap_screenshot", "KEY_F12");
-       settings->setDefault("keymap_toggle_profiler", "KEY_F2");
+       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_debug", "KEY_F5");
+       settings->setDefault("keymap_toggle_profiler", "KEY_F6");
+       settings->setDefault("keymap_increase_viewing_range_min", "+");
+       settings->setDefault("keymap_decrease_viewing_range_min", "-");
        // Some (temporary) keys for debugging
        settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
+       settings->setDefault("keymap_quicktune_prev", "KEY_HOME");
+       settings->setDefault("keymap_quicktune_next", "KEY_END");
+       settings->setDefault("keymap_quicktune_dec", "KEY_NEXT");
+       settings->setDefault("keymap_quicktune_inc", "KEY_PRIOR");
+
+       // Show debug info by default?
+       #ifdef NDEBUG
+       settings->setDefault("show_debug", "false");
+       #else
+       settings->setDefault("show_debug", "true");
+       #endif
 
        settings->setDefault("wanted_fps", "30");
        settings->setDefault("fps_max", "60");
-       settings->setDefault("viewing_range_nodes_max", "300");
-       settings->setDefault("viewing_range_nodes_min", "15");
+       // A bit more than the server will send around the player, to make fog blend well
+       settings->setDefault("viewing_range_nodes_min", "35");
+       settings->setDefault("viewing_range_nodes_max", "160");
        settings->setDefault("screenW", "800");
        settings->setDefault("screenH", "600");
        settings->setDefault("address", "");
@@ -62,9 +81,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("fov", "72");
        settings->setDefault("view_bobbing", "true");
        settings->setDefault("new_style_water", "false");
-       settings->setDefault("new_style_leaves", "true");
+       settings->setDefault("new_style_leaves", "false");
        settings->setDefault("smooth_lighting", "true");
-       settings->setDefault("frametime_graph", "false");
        settings->setDefault("enable_texture_atlas", "true");
        settings->setDefault("texture_path", "");
        settings->setDefault("video_driver", "opengl");
@@ -74,15 +92,18 @@ void set_default_settings(Settings *settings)
        settings->setDefault("invert_mouse", "false");
        settings->setDefault("enable_farmesh", "false");
        settings->setDefault("enable_clouds", "true");
-       settings->setDefault("invisible_stone", "false");
        settings->setDefault("screenshot_path", ".");
        settings->setDefault("view_bobbing_amount", "1.0");
-       settings->setDefault("enable_2d_clouds", "false");
+       settings->setDefault("enable_3d_clouds", "false");
+       settings->setDefault("opaque_water", "false");
+       settings->setDefault("console_color", "(0,0,0)");
+       settings->setDefault("console_alpha", "200");
 
        // Server stuff
        // "map-dir" doesn't exist by default.
+       settings->setDefault("default_game", "minetest");
        settings->setDefault("motd", "");
-       settings->setDefault("max_users", "20");
+       settings->setDefault("max_users", "100");
        settings->setDefault("strict_protocol_version_checking", "true");
        settings->setDefault("creative_mode", "false");
        settings->setDefault("enable_damage", "true");
@@ -91,23 +112,25 @@ void set_default_settings(Settings *settings)
        settings->setDefault("give_initial_stuff", "false");
        settings->setDefault("default_password", "");
        settings->setDefault("default_privs", "build, shout");
+       settings->setDefault("unlimited_player_transfer_distance", "true");
+       settings->setDefault("enable_pvp", "true");
 
        settings->setDefault("profiler_print_interval", "0");
        settings->setDefault("enable_mapgen_debug_info", "false");
-       settings->setDefault("objectdata_interval", "0.2");
        settings->setDefault("active_object_send_range_blocks", "3");
        settings->setDefault("active_block_range", "2");
        //settings->setDefault("max_simultaneous_block_sends_per_client", "1");
        // This causes frametime jitter on client side, or does it?
-       settings->setDefault("max_simultaneous_block_sends_per_client", "2");
-       settings->setDefault("max_simultaneous_block_sends_server_total", "8");
-       settings->setDefault("max_block_send_distance", "8");
-       settings->setDefault("max_block_generate_distance", "8");
-       settings->setDefault("time_send_interval", "20");
+       settings->setDefault("max_simultaneous_block_sends_per_client", "4");
+       settings->setDefault("max_simultaneous_block_sends_server_total", "20");
+       settings->setDefault("max_block_send_distance", "10");
+       settings->setDefault("max_block_generate_distance", "6");
+       settings->setDefault("time_send_interval", "5");
        settings->setDefault("time_speed", "96");
-       settings->setDefault("server_unload_unused_data_timeout", "60");
-       settings->setDefault("server_map_save_interval", "10");
+       settings->setDefault("server_unload_unused_data_timeout", "29");
+       settings->setDefault("server_map_save_interval", "5.3");
        settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
        settings->setDefault("enable_experimental", "false");
+       settings->setDefault("dedicated_server_step", "0.05");
 }