Add cancel button to password change menu. (#5720)

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

diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h
index de0ccaa2f5260f4633c9bc18fa7613faf56042cd..d049724b41b79e98b50a1cb2cf93b29419036909 100644 (file)
--- a/src/mapgen_fractal.h
+++ b/src/mapgen_fractal.h
@@ -32,8 +32,8 @@ class BiomeManager;
 
 extern FlagDesc flagdesc_mapgen_fractal[];
 
-
-struct MapgenFractalParams : public MapgenSpecificParams {
+struct MapgenFractalParams : public MapgenParams
+{
        u32 spflags;
        float cave_width;
        u16 fractal;
@@ -57,11 +57,14 @@ struct MapgenFractalParams : public MapgenSpecificParams {
        void writeParams(Settings *settings) const;
 };
 
-class MapgenFractal : public MapgenBasic {
+class MapgenFractal : public MapgenBasic
+{
 public:
-       MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+       MapgenFractal(int mapgenid, MapgenFractalParams *params, EmergeManager *emerge);
        ~MapgenFractal();
 
+       virtual MapgenType getType() const { return MAPGEN_FRACTAL; }
+
        virtual void makeChunk(BlockMakeData *data);
        int getSpawnLevelAtPoint(v2s16 p);
        bool getFractalAtPoint(s16 x, s16 y, s16 z);
@@ -81,24 +84,6 @@ private:
        float julia_z;
        float julia_w;
        Noise *noise_seabed;
-
-       content_t c_cobble;
-       content_t c_stair_cobble;
-       content_t c_mossycobble;
-       content_t c_sandstonebrick;
-       content_t c_stair_sandstonebrick;
-};
-
-struct MapgenFactoryFractal : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-       {
-               return new MapgenFractal(mgid, params, emerge);
-       };
-
-       MapgenSpecificParams *createMapgenParams()
-       {
-               return new MapgenFractalParams();
-       };
 };
 
 #endif