EnrichedString: Fix substr segfault caused by non-formatted text

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

diff --git a/src/mapgen/mapgen_flat.h b/src/mapgen/mapgen_flat.h
index 635d40625d77739d7ed184ac1e05de2375cf7397..2ff87c0db2f5192730ee1bc31ddeea4a53281f58 100644 (file)
--- a/src/mapgen/mapgen_flat.h
+++ b/src/mapgen/mapgen_flat.h
@@ -1,7 +1,7 @@
 /*
 Minetest
-Copyright (C) 2015-2017 paramat
-Copyright (C) 2015-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2015-2018 paramat
+Copyright (C) 2015-2018 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -35,16 +35,24 @@ struct MapgenFlatParams : public MapgenParams
        u32 spflags = 0;
        s16 ground_level = 8;
        s16 large_cave_depth = -33;
-       s16 lava_depth = -256;
+       u16 small_cave_num_min = 0;
+       u16 small_cave_num_max = 0;
+       u16 large_cave_num_min = 0;
+       u16 large_cave_num_max = 2;
+       float large_cave_flooded = 0.5f;
        float cave_width = 0.09f;
        float lake_threshold = -0.45f;
        float lake_steepness = 48.0f;
        float hill_threshold = 0.45f;
        float hill_steepness = 64.0f;
+       s16 dungeon_ymin = -31000;
+       s16 dungeon_ymax = 31000;
+
        NoiseParams np_terrain;
        NoiseParams np_filler_depth;
        NoiseParams np_cave1;
        NoiseParams np_cave2;
+       NoiseParams np_dungeons;
 
        MapgenFlatParams();
        ~MapgenFlatParams() = default;
@@ -56,7 +64,7 @@ struct MapgenFlatParams : public MapgenParams
 class MapgenFlat : public MapgenBasic
 {
 public:
-       MapgenFlat(int mapgenid, MapgenFlatParams *params, EmergeManager *emerge);
+       MapgenFlat(MapgenFlatParams *params, EmergeManager *emerge);
        ~MapgenFlat();
 
        virtual MapgenType getType() const { return MAPGEN_FLAT; }
@@ -67,10 +75,10 @@ public:
 
 private:
        s16 ground_level;
-       s16 large_cave_depth;
        float lake_threshold;
        float lake_steepness;
        float hill_threshold;
        float hill_steepness;
+
        Noise *noise_terrain;
 };