summaryrefslogtreecommitdiff
path: root/src/mapgen
diff options
context:
space:
mode:
authorParamat <paramat@users.noreply.github.com>2019-09-08 17:51:34 +0100
committerGitHub <noreply@github.com>2019-09-08 17:51:34 +0100
commit4682c7be5d4e4c454c6d8a18279f60acd970da50 (patch)
tree12faf8145e84185583f956e74de96fd55662b94a /src/mapgen
parente97cbcf34d6f50483a1097ad74d8a661d9433afb (diff)
downloadminetest-4682c7be5d4e4c454c6d8a18279f60acd970da50.tar.gz
minetest-4682c7be5d4e4c454c6d8a18279f60acd970da50.tar.bz2
minetest-4682c7be5d4e4c454c6d8a18279f60acd970da50.zip
Dungeons: Remove non-functional 'projecting dungeons' setting (#8897)
Diffstat (limited to 'src/mapgen')
-rw-r--r--src/mapgen/dungeongen.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mapgen/dungeongen.cpp b/src/mapgen/dungeongen.cpp
index efc3acc51..acdb1a0f0 100644
--- a/src/mapgen/dungeongen.cpp
+++ b/src/mapgen/dungeongen.cpp
@@ -86,8 +86,6 @@ void DungeonGen::generate(MMVManip *vm, u32 bseed, v3s16 nmin, v3s16 nmax)
//TimeTaker t("gen dungeons");
- static const bool preserve_ignore = !g_settings->getBool("projecting_dungeons");
-
this->vm = vm;
this->blockseed = bseed;
random.seed(bseed + 2);
@@ -96,9 +94,10 @@ void DungeonGen::generate(MMVManip *vm, u32 bseed, v3s16 nmin, v3s16 nmax)
vm->clearFlag(VMANIP_FLAG_DUNGEON_INSIDE | VMANIP_FLAG_DUNGEON_PRESERVE);
if (dp.only_in_ground) {
- // Set all air and liquid drawtypes to be untouchable to make dungeons
- // open to air and liquids.
- // Optionally set ignore to be untouchable to prevent projecting dungeons.
+ // Set all air and liquid drawtypes to be untouchable to make dungeons generate
+ // in ground only.
+ // Set 'ignore' to be untouchable to prevent generation in ungenerated neighbor
+ // mapchunks, to avoid dungeon rooms generating outside ground.
// Like randomwalk caves, preserve nodes that have 'is_ground_content = false',
// to avoid dungeons that generate out beyond the edge of a mapchunk destroying
// nodes added by mods in 'register_on_generated()'.
@@ -109,8 +108,7 @@ void DungeonGen::generate(MMVManip *vm, u32 bseed, v3s16 nmin, v3s16 nmax)
content_t c = vm->m_data[i].getContent();
NodeDrawType dtype = ndef->get(c).drawtype;
if (dtype == NDT_AIRLIKE || dtype == NDT_LIQUID ||
- (preserve_ignore && c == CONTENT_IGNORE) ||
- !ndef->get(c).is_ground_content)
+ c == CONTENT_IGNORE || !ndef->get(c).is_ground_content)
vm->m_flags[i] |= VMANIP_FLAG_DUNGEON_PRESERVE;
i++;
}