EnrichedString: Fix substr segfault caused by non-formatted text

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

diff --git a/src/mapgen/mapgen_v6.h b/src/mapgen/mapgen_v6.h
index 9c879421761099895432e1d5a636bc7634fae7ab..7d522955929744c68c12a89424b04fe1e3c04094 100644 (file)
--- a/src/mapgen/mapgen_v6.h
+++ b/src/mapgen/mapgen_v6.h
@@ -1,8 +1,8 @@
 /*
 Minetest
-Copyright (C) 2010-2015 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2013-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
-Copyright (C) 2014-2017 paramat
+Copyright (C) 2010-2018 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013-2018 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2014-2018 paramat
 
 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
@@ -59,6 +59,9 @@ struct MapgenV6Params : public MapgenParams {
                MGV6_BIOMEBLEND | MGV6_MUDFLOW;
        float freq_desert = 0.45f;
        float freq_beach = 0.15f;
+       s16 dungeon_ymin = -31000;
+       s16 dungeon_ymax = 31000;
+
        NoiseParams np_terrain_base;
        NoiseParams np_terrain_higher;
        NoiseParams np_steepness;
@@ -104,8 +107,13 @@ public:
        NoiseParams *np_humidity;
        NoiseParams *np_trees;
        NoiseParams *np_apple_trees;
+
+       NoiseParams np_dungeons;
+
        float freq_desert;
        float freq_beach;
+       s16 dungeon_ymin;
+       s16 dungeon_ymax;
 
        content_t c_stone;
        content_t c_dirt;
@@ -126,7 +134,7 @@ public:
        content_t c_stair_cobble;
        content_t c_stair_desert_stone;
 
-       MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge);
+       MapgenV6(MapgenV6Params *params, EmergeManager *emerge);
        ~MapgenV6();
 
        virtual MapgenType getType() const { return MAPGEN_V6; }