summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2016-05-10 22:06:03 -0400
committerkwolekr <kwolekr@minetest.net>2016-05-10 22:44:18 -0400
commitebe638c32db2fb29886a5ae82c7726afad4c0010 (patch)
treea47b71a0616143de3718005771754ba874d9fcf0 /src
parent5d9b6aaa03fb326073b1d70645a5c08f10b7e461 (diff)
downloadminetest-ebe638c32db2fb29886a5ae82c7726afad4c0010.tar.gz
minetest-ebe638c32db2fb29886a5ae82c7726afad4c0010.tar.bz2
minetest-ebe638c32db2fb29886a5ae82c7726afad4c0010.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/defaultsettings.cpp3
-rw-r--r--src/mapgen_v6.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 1536aed01..e8b652c17 100644
--- 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 e24083cff..c389b2ed4 100644
--- 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;