Display Lua memory usage at the time of Out-of-Memory error

[minetest.git] / src / mapgen_v7.h

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 7b08971bb8c69ec92d346b98025fcc22adac3f45..c0cfa8c77774c7bccc49d88ba4a62f2ba0f69b38 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,26 @@ 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;
+       Noise *noise_heat_blend;
+       Noise *noise_humidity_blend;
 
        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();
@@ -98,24 +105,24 @@ class MapgenV7 : public Mapgen {
        int getGroundLevelAtPoint(v2s16 p);
        Biome *getBiomeAtPoint(v3s16 p);
 
-       float baseTerrainLevelAtPoint(int x, int z);
+       float baseTerrainLevelAtPoint(s16 x, s16 z);
        float baseTerrainLevelFromMap(int index);
-       bool getMountainTerrainAtPoint(int x, int y, int z);
-       bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, int y);
+       bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z);
+       bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
 
        void calculateNoise();
 
        virtual int generateTerrain();
-       int generateBaseTerrain();
-       void generateMountainTerrain();
+       void generateBaseTerrain(s16 *stone_surface_min_y, s16 *stone_surface_max_y);
+       int generateMountainTerrain(s16 ymax);
        void generateRidgeTerrain();
 
-       void generateBiomes();
+       MgStoneType generateBiomes(float *heat_map, float *humidity_map);
        void dustTopNodes();
 
        //void addTopNodes();
 
-       void generateCaves(int max_stone_y);
+       void generateCaves(s16 max_stone_y);
 };
 
 struct MapgenFactoryV7 : public MapgenFactory {