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 e6d2cdc544bfc0ace08dc2ea77f9fadebf9be7bd..64aa2d87a58463151c483379a147c35b606af7ed 100644 (file)
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -65,12 +65,11 @@ struct MapgenV6Params : public MapgenSpecificParams {
 
 class MapgenV6 : public Mapgen {
 public:
-       EmergeManager *emerge;
+       EmergeManager *m_emerge;
 
        int ystride;
        u32 spflags;
 
-       u32 blockseed;
        v3s16 node_min;
        v3s16 node_max;
        v3s16 full_node_min;
@@ -115,7 +114,7 @@ class MapgenV6 : public Mapgen {
        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);
@@ -148,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();
        };
 };