Fix gettext on MSVC

[dragonfireclient.git] / src / mapgen_v5.h

diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index 22a836d64afe6deef5af297e4e331783699c5346..1949bf5db459ffe20d73d6ae6a8122c274cc1344 100644 (file)
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -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;
@@ -89,25 +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();
        };
 };