Fix building under MSVC

[dragonfireclient.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 9b407b1c36326207f3fe58ad20807f10f80d2d0e..0536028338cd3be057f1dc5246618aca2fbdec23 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -59,6 +59,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("aux1_descends", "false");
        settings->setDefault("doubletap_jump", "false");
        settings->setDefault("always_fly_fast", "true");
+       settings->setDefault("directional_colored_fog", "true");
 
        // Some (temporary) keys for debugging
        settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
@@ -76,6 +77,7 @@ void set_default_settings(Settings *settings)
 
        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");
@@ -139,7 +141,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("repeat_rightclick_time", "0.25");
        settings->setDefault("enable_particles", "true");
 
-       settings->setDefault("media_fetch_threads", "8");
+       settings->setDefault("curl_timeout", "5000");
+       settings->setDefault("curl_parallel_limit", "8");
 
        settings->setDefault("serverlist_url", "servers.minetest.net");
        settings->setDefault("serverlist_file", "favoriteservers.txt");
@@ -154,11 +157,13 @@ void set_default_settings(Settings *settings)
        settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "liberationsans.ttf"));
        settings->setDefault("font_size", "13");
        settings->setDefault("font_shadow", "1");
+       settings->setDefault("font_shadow_alpha", "128");
        settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "liberationmono.ttf"));
        settings->setDefault("mono_font_size", "13");
        settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf"));
        settings->setDefault("fallback_font_size", "13");
        settings->setDefault("fallback_font_shadow", "1");
+       settings->setDefault("fallback_font_shadow_alpha", "128");
 #else
        settings->setDefault("freetype", "false");
        settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "fontlucida.png"));
@@ -167,6 +172,8 @@ void set_default_settings(Settings *settings)
 
        // Server stuff
        // "map-dir" doesn't exist by default.
+       settings->setDefault("workaround_window_size","5");
+       settings->setDefault("max_packets_per_iteration","1024");
        settings->setDefault("port", "30000");
        settings->setDefault("default_game", "minetest");
        settings->setDefault("motd", "");
@@ -184,8 +191,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("disallow_empty_password", "false");
        settings->setDefault("disable_anticheat", "false");
        settings->setDefault("enable_rollback_recording", "false");
-       settings->setDefault("cache_block_before_spawn", "true");
-       settings->setDefault("max_spawn_height", "50");
 
        settings->setDefault("profiler_print_interval", "0");
        settings->setDefault("enable_mapgen_debug_info", "false");
@@ -265,7 +270,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("mgv7_np_terrain_alt",      "4, 25, (600, 600, 600), 5934, 5, 0.6");
        settings->setDefault("mgv7_np_terrain_persist",  "0.6, 0.1, (500, 500, 500), 539, 3, 0.6");
        settings->setDefault("mgv7_np_height_select",    "-0.5, 1, (250, 250, 250), 4213, 5, 0.69");
-       settings->setDefault("mgv7_np_filler_depth",     "0, 1.2, (150, 150, 150), 261, 4, 0.7");       
+       settings->setDefault("mgv7_np_filler_depth",     "0, 1.2, (150, 150, 150), 261, 4, 0.7");
        settings->setDefault("mgv7_np_mount_height",     "100, 30, (500, 500, 500), 72449, 4, 0.6");
        settings->setDefault("mgv7_np_ridge_uwater",     "0, 1, (500, 500, 500), 85039, 4, 0.6");
        settings->setDefault("mgv7_np_mountain",         "0, 1, (250, 350, 250), 5333, 5, 0.68");
@@ -283,7 +288,6 @@ void set_default_settings(Settings *settings)
 
        settings->setDefault("mgmath_generator", "mandelbox");
 
-       settings->setDefault("curl_timeout", "5000");
 
        // IPv6
        settings->setDefault("enable_ipv6", "true");