Fix RUN_IN_PLACE broken due to invalid usage of assert

[minetest.git] / src / mapgen_v5.h

diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index 22a836d64afe6deef5af297e4e331783699c5346..e95874e846dcb2c1ad303561461ded3aab58fca4 100644 (file)
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -23,7 +23,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen.h"
 
 /////////////////// Mapgen V5 flags
-#define MGV5_BLOBS 0x01
+//#define MGV5_   0x01
+
+class BiomeManager;
 
 extern FlagDesc flagdesc_mapgen_v5[];
 
@@ -36,8 +38,6 @@ struct MapgenV5Params : public MapgenSpecificParams {
        NoiseParams np_cave1;
        NoiseParams np_cave2;
        NoiseParams np_ground;
-       NoiseParams np_crumble;
-       NoiseParams np_wetness;
 
        MapgenV5Params();
        ~MapgenV5Params() {}
@@ -49,14 +49,13 @@ struct MapgenV5Params : public MapgenSpecificParams {
 
 class MapgenV5 : public Mapgen {
 public:
-       EmergeManager *emerge;
+       EmergeManager *m_emerge;
        BiomeManager *bmgr;
 
        int ystride;
        int zstride;
        u32 spflags;
 
-       u32 blockseed;
        v3s16 node_min;
        v3s16 node_max;
        v3s16 full_node_min;
@@ -68,8 +67,6 @@ class MapgenV5 : public Mapgen {
        Noise *noise_cave1;
        Noise *noise_cave2;
        Noise *noise_ground;
-       Noise *noise_crumble;
-       Noise *noise_wetness;
        Noise *noise_heat;
        Noise *noise_humidity;
 
@@ -89,25 +86,27 @@ class MapgenV5 : public Mapgen {
        content_t c_stair_cobble;
        content_t c_stair_sandstone;
 
-       MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge_);
+       MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge);
        ~MapgenV5();
 
        virtual void makeChunk(BlockMakeData *data);
        int getGroundLevelAtPoint(v2s16 p);
        void calculateNoise();
-       void generateBaseTerrain();
-       void generateBlobs();
-       void generateBiomes();
+       int generateBaseTerrain();
+       void generateBiomes(float *heat_map, float *humidity_map);
+       void generateCaves(int max_stone_y);
        void dustTopNodes();
 };
 
 
 struct MapgenFactoryV5 : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) {
+       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
+       {
                return new MapgenV5(mgid, params, emerge);
        };
 
-       MapgenSpecificParams *createMapgenParams() {
+       MapgenSpecificParams *createMapgenParams()
+       {
                return new MapgenV5Params();
        };
 };