Merge remote branch 'origin/master'

[minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 219cda9e70da2ee279a67dd386e195207bc39d06..7afe8df051bf8ed2df8780422ceffdd60b96cae3 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -185,9 +185,9 @@ void set_default_settings(Settings *settings)
        settings->setDefault("remote_media", "");
        settings->setDefault("debug_log_level", "0");
        settings->setDefault("emergequeue_limit_total", "256");
-       settings->setDefault("emergequeue_limit_diskonly", "5");
-       settings->setDefault("emergequeue_limit_generate", "1");
-       settings->setDefault("num_emerge_threads", "");
+       settings->setDefault("emergequeue_limit_diskonly", "");
+       settings->setDefault("emergequeue_limit_generate", "");
+       settings->setDefault("num_emerge_threads", "1");
        
        // physics stuff
        settings->setDefault("movement_acceleration_default", "3");
@@ -206,6 +206,11 @@ void set_default_settings(Settings *settings)
        //mapgen related things
        settings->setDefault("mg_name", "v6");
        settings->setDefault("water_level", "1");
+       settings->setDefault("liquid_finite", "false");
+       settings->setDefault("liquid_update", "1.0");
+       settings->setDefault("liquid_relax", "1");
+       settings->setDefault("liquid_fast_flood", "1");
+       
        settings->setDefault("chunksize", "5");
        settings->setDefault("mg_flags", "trees, caves, v6_biome_blend");
        settings->setDefault("mgv6_freq_desert", "0.45");