EnrichedString: Fix substr segfault caused by non-formatted text

[oweals/minetest.git] / src / mapgen / mapgen.h

diff --git a/src/mapgen/mapgen.h b/src/mapgen/mapgen.h
index f7697cab409a8cddf9d9bcb11777221fcc5071ab..1473d41a685647945685412d6544b17e6bda9854 100644 (file)
--- a/src/mapgen/mapgen.h
+++ b/src/mapgen/mapgen.h
@@ -244,7 +244,7 @@ public:
        virtual void generateBiomes();
        virtual void dustTopNodes();
        virtual void generateCavesNoiseIntersection(s16 max_stone_y);
-       virtual void generateCavesRandomWalk(s16 max_stone_y, s16 large_cave_depth);
+       virtual void generateCavesRandomWalk(s16 max_stone_y, s16 large_cave_ymax);
        virtual bool generateCavernsNoise(s16 max_stone_y);
        virtual void generateDungeons(s16 max_stone_y);
 
@@ -280,7 +280,12 @@ protected:
        float cavern_limit;
        float cavern_taper;
        float cavern_threshold;
-       // TODO 'lava_depth' is deprecated and should be removed. Cave liquids are
-       // now defined and located using biome definitions.
-       int lava_depth;
+       int small_cave_num_min;
+       int small_cave_num_max;
+       int large_cave_num_min;
+       int large_cave_num_max;
+       float large_cave_flooded;
+       s16 large_cave_depth;
+       s16 dungeon_ymin;
+       s16 dungeon_ymax;
 };