From d7bbe81726f46b46d88b188298155dc7519ae1a4 Mon Sep 17 00:00:00 2001 From: paramat Date: Sun, 15 Nov 2015 11:55:45 +0000 Subject: Mapgen: Add global 'decorations' flag Flag is set by default in MapgenParams The global 'trees' flag remains but is now undocumented and unset by default in MapgenParams Add mgv6_spflag 'trees' set by default in defaultsettings.cpp to affect new worlds only This is automatically backwards compatible for existing worlds --- src/mapgen_v6.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/mapgen_v6.cpp') diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp index 3f3ccba4f..3b5915bd1 100644 --- a/src/mapgen_v6.cpp +++ b/src/mapgen_v6.cpp @@ -43,6 +43,7 @@ FlagDesc flagdesc_mapgen_v6[] = { {"mudflow", MGV6_MUDFLOW}, {"snowbiomes", MGV6_SNOWBIOMES}, {"flat", MGV6_FLAT}, + {"trees", MGV6_TREES}, {NULL, 0} }; @@ -580,11 +581,12 @@ void MapgenV6::makeChunk(BlockMakeData *data) growGrass(); // Generate some trees, and add grass, if a jungle - if (flags & MG_TREES) + if ((spflags & MGV6_TREES) || (flags & MG_TREES)) placeTreesAndJungleGrass(); // Generate the registered decorations - m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); + if (flags & MG_DECORATIONS) + m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); // Generate the registered ores m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max); -- cgit v1.2.3