Replace std::list by std::vector into ServerMap::listAllLoadableBlocks ServerMap...

[minetest.git] / src / mapgen_v6.h

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index 1fac37fb677645f89387f19d8bdba73bfb8cc7c4..64aa2d87a58463151c483379a147c35b606af7ed 100644 (file)
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 extern FlagDesc flagdesc_mapgen_v6[];
 
 
-enum BiomeType
+enum BiomeV6Type
 {
        BT_NORMAL,
        BT_DESERT
@@ -55,23 +55,21 @@ struct MapgenV6Params : public MapgenSpecificParams {
        NoiseParams np_humidity;
        NoiseParams np_trees;
        NoiseParams np_apple_trees;
-       
+
        MapgenV6Params();
        ~MapgenV6Params() {}
-       
+
        void readParams(Settings *settings);
        void writeParams(Settings *settings);
 };
 
 class MapgenV6 : public Mapgen {
 public:
-       EmergeManager *emerge;
+       EmergeManager *m_emerge;
 
        int ystride;
-       u32 flags;
        u32 spflags;
 
-       u32 blockseed;
        v3s16 node_min;
        v3s16 node_max;
        v3s16 full_node_min;
@@ -111,12 +109,12 @@ class MapgenV6 : public Mapgen {
 
        MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge);
        ~MapgenV6();
-       
+
        void makeChunk(BlockMakeData *data);
        int getGroundLevelAtPoint(v2s16 p);
 
        float baseTerrainLevel(float terrain_base, float terrain_higher,
-                                                  float steepness, float height_select);
+               float steepness, float height_select);
        virtual float baseTerrainLevelFromNoise(v2s16 p);
        virtual float baseTerrainLevelFromMap(v2s16 p);
        virtual float baseTerrainLevelFromMap(int index);
@@ -124,7 +122,7 @@ class MapgenV6 : public Mapgen {
        s16 find_stone_level(v2s16 p2d);
        bool block_is_underground(u64 seed, v3s16 blockpos);
        s16 find_ground_level_from_noise(u64 seed, v2s16 p2d, s16 precision);
-       
+
        float getHumidity(v2s16 p);
        float getTreeAmount(v2s16 p);
        bool getHaveAppleTree(v2s16 p);
@@ -132,11 +130,11 @@ class MapgenV6 : public Mapgen {
        virtual float getMudAmount(int index);
        bool getHaveBeach(v2s16 p);
        bool getHaveBeach(int index);
-       BiomeType getBiome(v2s16 p);
-       BiomeType getBiome(int index, v2s16 p);
-       
+       BiomeV6Type getBiome(v2s16 p);
+       BiomeV6Type getBiome(int index, v2s16 p);
+
        u32 get_blockseed(u64 seed, v3s16 p);
-       
+
        virtual void calculateNoise();
        int generateGround();
        void addMud();
@@ -149,11 +147,13 @@ class MapgenV6 : public Mapgen {
 };
 
 struct MapgenFactoryV6 : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) {
+       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
+       {
                return new MapgenV6(mgid, params, emerge);
        };
-       
-       MapgenSpecificParams *createMapgenParams() {
+
+       MapgenSpecificParams *createMapgenParams()
+       {
                return new MapgenV6Params();
        };
 };