EnrichedString: Fix substr segfault caused by non-formatted text

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

diff --git a/src/mapgen/mapgen_v5.cpp b/src/mapgen/mapgen_v5.cpp
index 5164c5991fa7cf7216c90baaa7a40ac7a52f8553..c003c27d66ba1895e3817751c9c881cf60bbdb01 100644 (file)
--- a/src/mapgen/mapgen_v5.cpp
+++ b/src/mapgen/mapgen_v5.cpp
@@ -51,7 +51,6 @@ MapgenV5::MapgenV5(MapgenV5Params *params, EmergeManager *emerge)
        spflags            = params->spflags;
        cave_width         = params->cave_width;
        large_cave_depth   = params->large_cave_depth;
-       lava_depth         = params->lava_depth;
        small_cave_num_min = params->small_cave_num_min;
        small_cave_num_max = params->small_cave_num_max;
        large_cave_num_min = params->large_cave_num_min;
@@ -106,7 +105,6 @@ void MapgenV5Params::readParams(const Settings *settings)
        settings->getFlagStrNoEx("mgv5_spflags", spflags, flagdesc_mapgen_v5);
        settings->getFloatNoEx("mgv5_cave_width",         cave_width);
        settings->getS16NoEx("mgv5_large_cave_depth",     large_cave_depth);
-       settings->getS16NoEx("mgv5_lava_depth",           lava_depth);
        settings->getU16NoEx("mgv5_small_cave_num_min",   small_cave_num_min);
        settings->getU16NoEx("mgv5_small_cave_num_max",   small_cave_num_max);
        settings->getU16NoEx("mgv5_large_cave_num_min",   large_cave_num_min);
@@ -134,7 +132,6 @@ void MapgenV5Params::writeParams(Settings *settings) const
        settings->setFlagStr("mgv5_spflags", spflags, flagdesc_mapgen_v5, U32_MAX);
        settings->setFloat("mgv5_cave_width",         cave_width);
        settings->setS16("mgv5_large_cave_depth",     large_cave_depth);
-       settings->setS16("mgv5_lava_depth",           lava_depth);
        settings->setU16("mgv5_small_cave_num_min",   small_cave_num_min);
        settings->setU16("mgv5_small_cave_num_max",   small_cave_num_max);
        settings->setU16("mgv5_large_cave_num_min",   large_cave_num_min);
@@ -255,8 +252,7 @@ void MapgenV5::makeChunk(BlockMakeData *data)
        m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);
 
        // Generate dungeons and desert temples
-       if ((flags & MG_DUNGEONS) && full_node_min.Y >= dungeon_ymin &&
-                       full_node_max.Y <= dungeon_ymax)
+       if (flags & MG_DUNGEONS)
                generateDungeons(stone_surface_max_y);
 
        // Generate the registered decorations