Mapgen V6: Synchronize spflags with defaultsettings

This fixes an issue where trees are omitted from Mapgen V6 maps on
configurations that explicitly defined the mgv6_spflags setting.

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 1536aed01ab56a92d5ac21b58e3778ae0b28143a..e8b652c17ad52f7b945fabf73cd15c41e29fa7fc 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -180,7 +180,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_particles", "true");
        settings->setDefault("enable_mesh_cache", "false");
        settings->setDefault("enable_vbo", "true");
-       
+
        settings->setDefault("enable_minimap", "true");
        settings->setDefault("minimap_shape_round", "true");
        settings->setDefault("minimap_double_scan_height", "true");
@@ -319,7 +319,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("water_level", "1");
        settings->setDefault("chunksize", "5");
        settings->setDefault("mg_flags", "dungeons");
-       settings->setDefault("mgv6_spflags", "jungles, snowbiomes, trees");
 
        // IPv6
        settings->setDefault("enable_ipv6", "true");

diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index e24083cffb3b71d5092227633d7de2abf4959e8e..c389b2ed47fa9138bd90691f8a5d2d2ea6290409 100644 (file)
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -140,7 +140,9 @@ MapgenV6::~MapgenV6()
 
 MapgenV6Params::MapgenV6Params()
 {
-       spflags     = MGV6_BIOMEBLEND | MGV6_MUDFLOW;
+       spflags = MGV6_JUNGLES | MGV6_SNOWBIOMES | MGV6_TREES |
+               MGV6_BIOMEBLEND | MGV6_MUDFLOW;
+
        freq_desert = 0.45;
        freq_beach  = 0.15;