Biome API: Enable biome generation to lower world limit

[minetest.git] / src / mapgen_v7.h

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index b297770d5a375cef9dbea5a2fd56a94fa17f1a5f..eb46c371b2683d6cf0cc9284681612f8b2430ead 100644 (file)
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -42,12 +42,14 @@ struct MapgenV7Params : public MapgenSpecificParams {
        NoiseParams np_ridge_uwater;
        NoiseParams np_mountain;
        NoiseParams np_ridge;
+       NoiseParams np_cave1;
+       NoiseParams np_cave2;
 
        MapgenV7Params();
        ~MapgenV7Params() {}
 
-       void readParams(Settings *settings);
-       void writeParams(Settings *settings);
+       void readParams(const Settings *settings);
+       void writeParams(Settings *settings) const;
 };
 
 class MapgenV7 : public Mapgen {
@@ -75,21 +77,24 @@ class MapgenV7 : public Mapgen {
        Noise *noise_ridge_uwater;
        Noise *noise_mountain;
        Noise *noise_ridge;
+       Noise *noise_cave1;
+       Noise *noise_cave2;
 
        Noise *noise_heat;
        Noise *noise_humidity;
 
        content_t c_stone;
-       content_t c_dirt;
-       content_t c_dirt_with_grass;
-       content_t c_sand;
        content_t c_water_source;
        content_t c_lava_source;
+       content_t c_desert_stone;
        content_t c_ice;
-       content_t c_gravel;
+       content_t c_sandstone;
+
        content_t c_cobble;
-       content_t c_desert_sand;
-       content_t c_desert_stone;
+       content_t c_stair_cobble;
+       content_t c_mossycobble;
+       content_t c_sandstonebrick;
+       content_t c_stair_sandstonebrick;
 
        MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
        ~MapgenV7();
@@ -110,7 +115,7 @@ class MapgenV7 : public Mapgen {
        int generateMountainTerrain(int ymax);
        void generateRidgeTerrain();
 
-       void generateBiomes();
+       MgStoneType generateBiomes(float *heat_map, float *humidity_map);
        void dustTopNodes();
 
        //void addTopNodes();