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.
master
kwolekr 2016-05-10 22:06:03 -04:00
parent 5d9b6aaa03
commit ebe638c32d
2 changed files with 4 additions and 3 deletions

View File

@ -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");

View File

@ -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;