mapgen: drop mapgen id from child mapgens.

[oweals/minetest.git] / src / mapgen / dungeongen.cpp

diff --git a/src/mapgen/dungeongen.cpp b/src/mapgen/dungeongen.cpp
index 32bea4caa4aadf5e35d60c284f158b788ea6889a..3acd22877fd49d0efc04154994b8ad566e40d99b 100644 (file)
--- a/src/mapgen/dungeongen.cpp
+++ b/src/mapgen/dungeongen.cpp
@@ -51,7 +51,7 @@ DungeonGen::DungeonGen(const NodeDefManager *ndef,
 #endif
 
        if (dparams) {
-               memcpy(&dp, dparams, sizeof(dp));
+               dp = *dparams;
        } else {
                // Default dungeon parameters
                dp.seed = 0;
@@ -100,8 +100,11 @@ void DungeonGen::generate(MMVManip *vm, u32 bseed, v3s16 nmin, v3s16 nmax)
 
        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.
+               // open to air and liquids.
+               // Optionally set ignore to be untouchable to prevent projecting dungeons.
+               // 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()'.
                for (s16 z = nmin.Z; z <= nmax.Z; z++) {
                        for (s16 y = nmin.Y; y <= nmax.Y; y++) {
                                u32 i = vm->m_area.index(nmin.X, y, z);
@@ -109,7 +112,8 @@ 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))
+                                                       (preserve_ignore && c == CONTENT_IGNORE) ||
+                                                       !ndef->get(c).is_ground_content)
                                                vm->m_flags[i] |= VMANIP_FLAG_DUNGEON_PRESERVE;
                                        i++;
                                }