Lint fix

[minetest.git] / src / mg_ore.h

diff --git a/src/mg_ore.h b/src/mg_ore.h
index eaaf2b88323cd31a2f98389cec94b5cd1d05054c..4801b152ec832d043b499c6627c54ae7f083b47f 100644 (file)
--- a/src/mg_ore.h
+++ b/src/mg_ore.h
@@ -42,6 +42,7 @@ enum OreType {
        ORE_PUFF,
        ORE_BLOB,
        ORE_VEIN,
+       ORE_STRATUM,
 };
 
 extern FlagDesc flagdesc_ore[];
@@ -64,13 +65,12 @@ class Ore : public ObjDef, public NodeResolver {
        Noise *noise = nullptr;
        std::unordered_set<u8> biomes;
 
-       Ore() {};
+       Ore() = default;;
        virtual ~Ore();
 
        virtual void resolveNodeNames();
 
-       size_t placeOre(Mapgen *mg, u32 blockseed,
-               v3s16 nmin, v3s16 nmax, s16 ore_zero_level);
+       size_t placeOre(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
        virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
                v3s16 nmin, v3s16 nmax, u8 *biomemap) = 0;
 };
@@ -133,10 +133,24 @@ class OreVein : public Ore {
                v3s16 nmin, v3s16 nmax, u8 *biomemap);
 };
 
+class OreStratum : public Ore {
+public:
+       static const bool NEEDS_NOISE = true;
+
+       NoiseParams np_stratum_thickness;
+       Noise *noise_stratum_thickness = nullptr;
+
+       OreStratum() = default;
+       virtual ~OreStratum();
+
+       virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
+               v3s16 nmin, v3s16 nmax, u8 *biomemap);
+};
+
 class OreManager : public ObjDefManager {
 public:
        OreManager(IGameDef *gamedef);
-       virtual ~OreManager() {}
+       virtual ~OreManager() = default;
 
        const char *getObjectTitle() const
        {
@@ -156,6 +170,8 @@ class OreManager : public ObjDefManager {
                        return new OreBlob;
                case ORE_VEIN:
                        return new OreVein;
+               case ORE_STRATUM:
+                       return new OreStratum;
                default:
                        return nullptr;
                }
@@ -163,6 +179,5 @@ class OreManager : public ObjDefManager {
 
        void clear();
 
-       size_t placeAllOres(Mapgen *mg, u32 blockseed,
-               v3s16 nmin, v3s16 nmax, s16 ore_zero_level = 0);
+       size_t placeAllOres(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
 };