Cleanup in content_mapblock (#5746)

[oweals/minetest.git] / src / mapgen_valleys.h

diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h
index faaffa905c22f4273ae3413198d5afbe2808d298..0c67c3232f137b7a255f677b98fd083f065c06c9 100644 (file)
--- a/src/mapgen_valleys.h
+++ b/src/mapgen_valleys.h
@@ -46,7 +46,7 @@ class BiomeGenOriginal;
 //extern Profiler *mapgen_profiler;
 
 
-struct MapgenValleysParams : public MapgenSpecificParams {
+struct MapgenValleysParams : public MapgenParams {
        u32 spflags;
        s16 large_cave_depth;
        s16 massive_cave_depth;
@@ -88,9 +88,11 @@ struct TerrainNoise {
 class MapgenValleys : public MapgenBasic {
 public:
 
-       MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+       MapgenValleys(int mapgenid, MapgenValleysParams *params, EmergeManager *emerge);
        ~MapgenValleys();
 
+       virtual MapgenType getType() const { return MAPGEN_VALLEYS; }
+
        virtual void makeChunk(BlockMakeData *data);
        int getSpawnLevelAtPoint(v2s16 p);
 
@@ -99,8 +101,6 @@ public:
 private:
        BiomeGenOriginal *m_bgen;
 
-       float map_gen_limit;
-
        bool humid_rivers;
        bool use_altitude_chill;
        float humidity_adjust;
@@ -124,8 +124,6 @@ private:
        Noise *noise_valley_depth;
        Noise *noise_valley_profile;
 
-       content_t c_lava_source;
-
        float terrainLevelAtPoint(s16 x, s16 z);
 
        void calculateNoise();
@@ -137,16 +135,4 @@ private:
        virtual void generateCaves(s16 max_stone_y, s16 large_cave_depth);
 };
 
-struct MapgenFactoryValleys : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-       {
-               return new MapgenValleys(mgid, params, emerge);
-       };
-
-       MapgenSpecificParams *createMapgenParams()
-       {
-               return new MapgenValleysParams();
-       };
-};
-
 #endif