Add core.request_insecure_environment()

[dragonfireclient.git] / src / mg_ore.h

diff --git a/src/mg_ore.h b/src/mg_ore.h
index 59a1341b76046b856a745da50708fa702117f21d..cff1622fbc57a8ce88ff4a0e5182b2ecf0a68244 100644 (file)
--- a/src/mg_ore.h
+++ b/src/mg_ore.h
@@ -63,15 +63,16 @@ class Ore : public ObjDef, public NodeResolver {
        float nthresh;      // threshhold for noise at which an ore is placed
        NoiseParams np;     // noise for distribution of clusters (NULL for uniform scattering)
        Noise *noise;
+       std::set<u8> biomes;
 
        Ore();
        virtual ~Ore();
 
-       virtual void resolveNodeNames(NodeResolveInfo *nri);
+       virtual void resolveNodeNames();
 
        size_t placeOre(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
        virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
-               v3s16 nmin, v3s16 nmax) = 0;
+               v3s16 nmin, v3s16 nmax, u8 *biomemap) = 0;
 };
 
 class OreScatter : public Ore {
@@ -79,7 +80,7 @@ class OreScatter : public Ore {
        static const bool NEEDS_NOISE = false;
 
        virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
-               v3s16 nmin, v3s16 nmax);
+               v3s16 nmin, v3s16 nmax, u8 *biomemap);
 };
 
 class OreSheet : public Ore {
@@ -87,7 +88,7 @@ class OreSheet : public Ore {
        static const bool NEEDS_NOISE = true;
 
        virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
-               v3s16 nmin, v3s16 nmax);
+               v3s16 nmin, v3s16 nmax, u8 *biomemap);
 };
 
 class OreBlob : public Ore {
@@ -95,7 +96,7 @@ class OreBlob : public Ore {
        static const bool NEEDS_NOISE = true;
 
        virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
-               v3s16 nmin, v3s16 nmax);
+               v3s16 nmin, v3s16 nmax, u8 *biomemap);
 };
 
 class OreVein : public Ore {
@@ -109,13 +110,13 @@ class OreVein : public Ore {
        virtual ~OreVein();
 
        virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
-               v3s16 nmin, v3s16 nmax);
+               v3s16 nmin, v3s16 nmax, u8 *biomemap);
 };
 
 class OreManager : public ObjDefManager {
 public:
        OreManager(IGameDef *gamedef);
-       ~OreManager() {}
+       virtual ~OreManager() {}
 
        const char *getObjectTitle() const
        {