Mapgen V6: Synchronize spflags with defaultsettings

kwolekr · kwolekr · commit ebe638c32db2 · 2016-05-10T22:44:18.000-04:00
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
@@ -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
@@ -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;
 

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,9 @@ MapgenV6::~MapgenV6()`
`140`	`140`
`141`	`141`	`MapgenV6Params::MapgenV6Params()`
`142`	`142`	`{`
`143`		`- spflags = MGV6_BIOMEBLEND \| MGV6_MUDFLOW;`
	`143`	`+ spflags = MGV6_JUNGLES \| MGV6_SNOWBIOMES \| MGV6_TREES \|`
	`144`	`+ MGV6_BIOMEBLEND \| MGV6_MUDFLOW;`
	`145`	`+`
`144`	`146`	`freq_desert = 0.45;`
`145`	`147`	`freq_beach = 0.15;`
`146`	`148`