Fix Lint broken by b662a4577d692329b9ca83525e6039f2ddcd1ac1

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

diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index 4112bbfa61135db551bba763ac3788eba8913b2e..1cdb33683b9050f1d05c345f65ca3b66021bb4ba 100644 (file)
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -25,19 +25,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define MGV5_LARGE_CAVE_DEPTH -256
 
+///////// Mapgen V5 flags
+#define MGV5_CAVERNS 0x01
+
 class BiomeManager;
 
 extern FlagDesc flagdesc_mapgen_v5[];
 
-
-struct MapgenV5Params : public MapgenSpecificParams {
+struct MapgenV5Params : public MapgenParams
+{
        u32 spflags;
+       float cave_width;
+       s16 cavern_limit;
+       s16 cavern_taper;
+       float cavern_threshold;
+
        NoiseParams np_filler_depth;
        NoiseParams np_factor;
        NoiseParams np_height;
+       NoiseParams np_ground;
        NoiseParams np_cave1;
        NoiseParams np_cave2;
-       NoiseParams np_ground;
+       NoiseParams np_cavern;
 
        MapgenV5Params();
        ~MapgenV5Params() {}
@@ -46,69 +55,22 @@ struct MapgenV5Params : public MapgenSpecificParams {
        void writeParams(Settings *settings) const;
 };
 
-
-class MapgenV5 : public Mapgen {
+class MapgenV5 : public MapgenBasic
+{
 public:
-       EmergeManager *m_emerge;
-       BiomeManager *bmgr;
+       MapgenV5(int mapgenid, MapgenV5Params *params, EmergeManager *emerge);
+       ~MapgenV5();
 
-       int ystride;
-       int zstride;
-       u32 spflags;
+       virtual MapgenType getType() const { return MAPGEN_V5; }
 
-       v3s16 node_min;
-       v3s16 node_max;
-       v3s16 full_node_min;
-       v3s16 full_node_max;
+       virtual void makeChunk(BlockMakeData *data);
+       int getSpawnLevelAtPoint(v2s16 p);
+       int generateBaseTerrain();
 
-       Noise *noise_filler_depth;
+private:
        Noise *noise_factor;
        Noise *noise_height;
-       Noise *noise_cave1;
-       Noise *noise_cave2;
        Noise *noise_ground;
-
-       Noise *noise_heat;
-       Noise *noise_humidity;
-       Noise *noise_heat_blend;
-       Noise *noise_humidity_blend;
-
-       content_t c_stone;
-       content_t c_water_source;
-       content_t c_lava_source;
-       content_t c_desert_stone;
-       content_t c_ice;
-       content_t c_sandstone;
-
-       content_t c_cobble;
-       content_t c_stair_cobble;
-       content_t c_mossycobble;
-       content_t c_sandstonebrick;
-       content_t c_stair_sandstonebrick;
-
-       MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge);
-       ~MapgenV5();
-
-       virtual void makeChunk(BlockMakeData *data);
-       int getGroundLevelAtPoint(v2s16 p);
-       void calculateNoise();
-       int generateBaseTerrain();
-       MgStoneType generateBiomes(float *heat_map, float *humidity_map);
-       void generateCaves(int max_stone_y);
-       void dustTopNodes();
-};
-
-
-struct MapgenFactoryV5 : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-       {
-               return new MapgenV5(mgid, params, emerge);
-       };
-
-       MapgenSpecificParams *createMapgenParams()
-       {
-               return new MapgenV5Params();
-       };
 };
 
 #endif