Fix mapgen using unitialised height map values

[minetest.git] / src / mg_ore.h

diff --git a/src/mg_ore.h b/src/mg_ore.h
index dc33873d4d9e5b68c50274551c916bd62e693865..67ca9a849630f03d1ad5801ab157ecf4e10874e1 100644 (file)
--- a/src/mg_ore.h
+++ b/src/mg_ore.h
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 struct NoiseParams;
 class Noise;
 class Mapgen;
-class ManualMapVoxelManipulator;
+class MMVManip;
 
 /////////////////// Ore generation flags
 
@@ -70,32 +70,32 @@ class Ore : public GenElement, public NodeResolver {
        virtual void resolveNodeNames(NodeResolveInfo *nri);
 
        size_t placeOre(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
-       virtual void generate(ManualMapVoxelManipulator *vm, int seed,
-               u32 blockseed, v3s16 nmin, v3s16 nmax) = 0;
+       virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
+               v3s16 nmin, v3s16 nmax) = 0;
 };
 
 class OreScatter : public Ore {
 public:
        static const bool NEEDS_NOISE = false;
 
-       virtual void generate(ManualMapVoxelManipulator *vm, int seed,
-               u32 blockseed, v3s16 nmin, v3s16 nmax);
+       virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
+               v3s16 nmin, v3s16 nmax);
 };
 
 class OreSheet : public Ore {
 public:
        static const bool NEEDS_NOISE = true;
 
-       virtual void generate(ManualMapVoxelManipulator *vm, int seed,
-               u32 blockseed, v3s16 nmin, v3s16 nmax);
+       virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
+               v3s16 nmin, v3s16 nmax);
 };
 
 class OreBlob : public Ore {
 public:
        static const bool NEEDS_NOISE = true;
 
-       virtual void generate(ManualMapVoxelManipulator *vm, int seed,
-               u32 blockseed, v3s16 nmin, v3s16 nmax);
+       virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
+               v3s16 nmin, v3s16 nmax);
 };
 
 class OreVein : public Ore {
@@ -105,10 +105,11 @@ class OreVein : public Ore {
        float random_factor;
        Noise *noise2;
 
+       OreVein();
        virtual ~OreVein();
 
-       virtual void generate(ManualMapVoxelManipulator *vm, int seed,
-               u32 blockseed, v3s16 nmin, v3s16 nmax);
+       virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
+               v3s16 nmin, v3s16 nmax);
 };
 
 class OreManager : public GenElementManager {
@@ -137,7 +138,7 @@ class OreManager : public GenElementManager {
 
        void clear();
 
-       size_t placeAllOres(Mapgen *mg, u32 seed, v3s16 nmin, v3s16 nmax);
+       size_t placeAllOres(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
 };
 
 #endif