Pass clang-format on various cpp/header files (#5559)

[dragonfireclient.git] / src / mapgen_fractal.h

diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h
index e30550405119039801d92b9993e239eb08e01d45..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,12 +57,23 @@ struct MapgenFractalParams : public MapgenSpecificParams {
        void writeParams(Settings *settings) const;
 };
 
-class MapgenFractal : public MapgenBasic {
+class MapgenFractal : public MapgenBasic
+{
 public:
+       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);
+       s16 generateTerrain();
+
+private:
        u16 formula;
        bool julia;
 
-       u32 spflags;
        u16 fractal;
        u16 iterations;
        v3f scale;
@@ -73,35 +84,6 @@ class MapgenFractal : public MapgenBasic {
        float julia_z;
        float julia_w;
        Noise *noise_seabed;
-
-       content_t c_lava_source;
-       content_t c_ice;
-
-       content_t c_cobble;
-       content_t c_stair_cobble;
-       content_t c_mossycobble;
-       content_t c_sandstonebrick;
-       content_t c_stair_sandstonebrick;
-
-       MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *emerge);
-       ~MapgenFractal();
-
-       virtual void makeChunk(BlockMakeData *data);
-       int getSpawnLevelAtPoint(v2s16 p);
-       bool getFractalAtPoint(s16 x, s16 y, s16 z);
-       s16 generateTerrain();
-};
-
-struct MapgenFactoryFractal : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-       {
-               return new MapgenFractal(mgid, params, emerge);
-       };
-
-       MapgenSpecificParams *createMapgenParams()
-       {
-               return new MapgenFractalParams();
-       };
 };
 
 #endif