findSpawnPos: Add setting for max height above water level

[minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 73e36da98f68b8680f275a492d82b37b1d4cd8d9..4a420445c70aedfa4b5a4818334f3284d2411970 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -58,7 +58,7 @@ void set_default_settings(Settings *settings)
 #if DEBUG
                        "KEY_F4");
 #else
-                       "none");
+                       "");
 #endif
        settings->setDefault("keymap_toggle_debug", "KEY_F5");
        settings->setDefault("keymap_toggle_profiler", "KEY_F6");
@@ -94,6 +94,7 @@ void set_default_settings(Settings *settings)
        // 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("map_generation_limit", "31000");
        settings->setDefault("screenW", "800");
        settings->setDefault("screenH", "600");
        settings->setDefault("fullscreen", "false");
@@ -103,11 +104,12 @@ void set_default_settings(Settings *settings)
        settings->setDefault("address", "");
        settings->setDefault("random_input", "false");
        settings->setDefault("client_unload_unused_data_timeout", "600");
+       settings->setDefault("client_mapblock_limit", "5000");
        settings->setDefault("enable_fog", "true");
        settings->setDefault("fov", "72");
        settings->setDefault("view_bobbing", "true");
        settings->setDefault("new_style_water", "false");
-       settings->setDefault("new_style_leaves", "true");
+       settings->setDefault("leaves_style", "fancy");
        settings->setDefault("connected_glass", "false");
        settings->setDefault("smooth_lighting", "true");
        settings->setDefault("display_gamma", "1.8");
@@ -175,10 +177,11 @@ void set_default_settings(Settings *settings)
        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("enable_mesh_cache", "false");
 
        settings->setDefault("enable_minimap", "true");
        settings->setDefault("minimap_shape_round", "true");
+       settings->setDefault("minimap_double_scan_height", "true");
 
        settings->setDefault("curl_timeout", "5000");
        settings->setDefault("curl_parallel_limit", "8");
@@ -242,6 +245,7 @@ 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");
@@ -251,6 +255,10 @@ void set_default_settings(Settings *settings)
        settings->setDefault("deprecated_lua_api_handling", "log");
 #endif
 
+       settings->setDefault("kick_msg_shutdown", "Server shutting down.");
+       settings->setDefault("kick_msg_crash", "This server has experienced an internal error. You will now be disconnected.");
+       settings->setDefault("ask_reconnect_on_crash", "false");
+
        settings->setDefault("profiler_print_interval", "0");
        settings->setDefault("enable_mapgen_debug_info", "false");
        settings->setDefault("active_object_send_range_blocks", "3");
@@ -264,7 +272,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096");
        settings->setDefault("time_send_interval", "5");
        settings->setDefault("time_speed", "72");
-       settings->setDefault("year_days", "30");
        settings->setDefault("server_unload_unused_data_timeout", "29");
        settings->setDefault("max_objects_per_block", "49");
        settings->setDefault("server_map_save_interval", "5.3");
@@ -273,7 +280,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("dedicated_server_step", "0.1");
        settings->setDefault("ignore_world_load_errors", "false");
        settings->setDefault("remote_media", "");
-       settings->setDefault("debug_log_level", "2");
+       settings->setDefault("debug_log_level", "action");
        settings->setDefault("emergequeue_limit_total", "256");
        settings->setDefault("emergequeue_limit_diskonly", "32");
        settings->setDefault("emergequeue_limit_generate", "32");
@@ -306,7 +313,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("chunksize", "5");
        settings->setDefault("mg_flags", "dungeons");
        settings->setDefault("mgv6_spflags", "jungles, snowbiomes");
-       settings->setDefault("enable_floating_dungeons", "true");
 
        // IPv6
        settings->setDefault("enable_ipv6", "true");