Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / mapgen / mapgen_flat.h

diff --git a/src/mapgen/mapgen_flat.h b/src/mapgen/mapgen_flat.h
index c314c76056cc1c3efc5251df3eb2be09b858acb5..4b46aff27343b90acefad8807ed2349001fcc980 100644 (file)
--- a/src/mapgen/mapgen_flat.h
+++ b/src/mapgen/mapgen_flat.h
@@ -1,7 +1,7 @@
 /*
 Minetest
-Copyright (C) 2015-2018 paramat
-Copyright (C) 2015-2018 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2015-2020 paramat
+Copyright (C) 2015-2016 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
@@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 /////// Mapgen Flat flags
 #define MGFLAT_LAKES 0x01
 #define MGFLAT_HILLS 0x02
+#define MGFLAT_CAVERNS 0x04
 
 class BiomeManager;
 
@@ -33,22 +34,27 @@ extern FlagDesc flagdesc_mapgen_flat[];
 struct MapgenFlatParams : public MapgenParams
 {
        s16 ground_level = 8;
-       s16 large_cave_depth = -33;
+       float lake_threshold = -0.45f;
+       float lake_steepness = 48.0f;
+       float hill_threshold = 0.45f;
+       float hill_steepness = 64.0f;
+
+       float cave_width = 0.09f;
        u16 small_cave_num_min = 0;
        u16 small_cave_num_max = 0;
        u16 large_cave_num_min = 0;
        u16 large_cave_num_max = 2;
+       s16 large_cave_depth = -33;
        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 cavern_limit = -256;
+       s16 cavern_taper = 256;
+       float cavern_threshold = 0.7f;
        s16 dungeon_ymin = -31000;
        s16 dungeon_ymax = 31000;
 
        NoiseParams np_terrain;
        NoiseParams np_filler_depth;
+       NoiseParams np_cavern;
        NoiseParams np_cave1;
        NoiseParams np_cave2;
        NoiseParams np_dungeons;
@@ -64,7 +70,7 @@ struct MapgenFlatParams : public MapgenParams
 class MapgenFlat : public MapgenBasic
 {
 public:
-       MapgenFlat(MapgenFlatParams *params, EmergeManager *emerge);
+       MapgenFlat(MapgenFlatParams *params, EmergeParams *emerge);
        ~MapgenFlat();
 
        virtual MapgenType getType() const { return MAPGEN_FLAT; }