Use fixed size for builtin menus on non-android platforms

[minetest.git] / src / mapgen_v5.h

diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index c38113fecfbfcf74cfb32c52103d01cafd179f22..1949bf5db459ffe20d73d6ae6a8122c274cc1344 100644 (file)
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen.h"
 
 /////////////////// Mapgen V5 flags
-//#define MGV5_BLOBS 0x01
+#define MGV5_BLOBS 0x01
 
 extern FlagDesc flagdesc_mapgen_v5[];
 
@@ -41,7 +41,7 @@ struct MapgenV5Params : public MapgenSpecificParams {
 
        MapgenV5Params();
        ~MapgenV5Params() {}
-       
+
        void readParams(Settings *settings);
        void writeParams(Settings *settings);
 };
@@ -49,20 +49,18 @@ struct MapgenV5Params : public MapgenSpecificParams {
 
 class MapgenV5 : public Mapgen {
 public:
-       EmergeManager *emerge;
-       BiomeDefManager *bmgr;
+       EmergeManager *m_emerge;
+       BiomeManager *bmgr;
 
        int ystride;
        int zstride;
-       u32 flags;
        u32 spflags;
 
-       u32 blockseed;
        v3s16 node_min;
        v3s16 node_max;
        v3s16 full_node_min;
        v3s16 full_node_max;
-       
+
        Noise *noise_filler_depth;
        Noise *noise_factor;
        Noise *noise_height;
@@ -90,24 +88,28 @@ 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();
+       int generateBaseTerrain();
        void generateBiomes();
+       void generateCaves();
+       void generateBlobs();
        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();
        };
 };