BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Dungeons: Remove non-functional 'projecting dungeons' setting (#8897)

Browse Source
This commit is contained in:
Paramat 2019-09-08 17:51:34 +01:00 committed by GitHub
parent e97cbcf34d
commit 4682c7be5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/settingtypes.txt
View File

@ -1384,9 +1384,6 @@ mapgen_limit (Map generation limit) int 31000 0 31000
# and junglegrass, in all other mapgens this flag controls all decorations. # and junglegrass, in all other mapgens this flag controls all decorations.
mg_flags (Mapgen flags) flags caves,dungeons,light,decorations,biomes caves,dungeons,light,decorations,biomes,nocaves,nodungeons,nolight,nodecorations,nobiomes mg_flags (Mapgen flags) flags caves,dungeons,light,decorations,biomes caves,dungeons,light,decorations,biomes,nocaves,nodungeons,nolight,nodecorations,nobiomes
# Whether dungeons occasionally project from the terrain.
projecting_dungeons (Projecting dungeons) bool true
[*Biome API temperature and humidity noise parameters] [*Biome API temperature and humidity noise parameters]
# Temperature variation for biomes. # Temperature variation for biomes.

1
src/defaultsettings.cpp
View File

@ -421,7 +421,6 @@ void set_default_settings(Settings *settings)
settings->setDefault("mg_flags", "caves,dungeons,light,decorations,biomes"); settings->setDefault("mg_flags", "caves,dungeons,light,decorations,biomes");
settings->setDefault("fixed_map_seed", ""); settings->setDefault("fixed_map_seed", "");
settings->setDefault("max_block_generate_distance", "8"); settings->setDefault("max_block_generate_distance", "8");
settings->setDefault("projecting_dungeons", "true");
settings->setDefault("enable_mapgen_debug_info", "false"); settings->setDefault("enable_mapgen_debug_info", "false");
// Server list announcing // Server list announcing

12
src/mapgen/dungeongen.cpp
View File

@ -86,8 +86,6 @@ void DungeonGen::generate(MMVManip *vm, u32 bseed, v3s16 nmin, v3s16 nmax)
//TimeTaker t("gen dungeons"); //TimeTaker t("gen dungeons");
static const bool preserve_ignore = !g_settings->getBool("projecting_dungeons");
this->vm = vm; this->vm = vm;
this->blockseed = bseed; this->blockseed = bseed;
random.seed(bseed + 2); 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); vm->clearFlag(VMANIP_FLAG_DUNGEON_INSIDE | VMANIP_FLAG_DUNGEON_PRESERVE);
if (dp.only_in_ground) { if (dp.only_in_ground) {
// Set all air and liquid drawtypes to be untouchable to make dungeons // Set all air and liquid drawtypes to be untouchable to make dungeons generate
// open to air and liquids. // in ground only.
// Optionally set ignore to be untouchable to prevent projecting dungeons. // 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', // Like randomwalk caves, preserve nodes that have 'is_ground_content = false',
// to avoid dungeons that generate out beyond the edge of a mapchunk destroying // to avoid dungeons that generate out beyond the edge of a mapchunk destroying
// nodes added by mods in 'register_on_generated()'. // 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(); content_t c = vm->m_data[i].getContent();
NodeDrawType dtype = ndef->get(c).drawtype; NodeDrawType dtype = ndef->get(c).drawtype;
if (dtype == NDT_AIRLIKE || dtype == NDT_LIQUID || if (dtype == NDT_AIRLIKE || dtype == NDT_LIQUID ||
(preserve_ignore && c == CONTENT_IGNORE) || c == CONTENT_IGNORE || !ndef->get(c).is_ground_content)
!ndef->get(c).is_ground_content)
vm->m_flags[i] |= VMANIP_FLAG_DUNGEON_PRESERVE; vm->m_flags[i] |= VMANIP_FLAG_DUNGEON_PRESERVE;
i++; i++;
} }