Pre-select current game in world creation dialog

[dragonfireclient.git] / src / mapgen.h

diff --git a/src/mapgen.h b/src/mapgen.h
index e708f23b1e621fb68c262826c760f818c147f0f4..17136a13796c704de70ca44166752f51d923b0e5 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -120,7 +120,6 @@ class Ore {
 public:
        std::string ore_name;
        std::string wherein_name;
-
        content_t ore;
        content_t wherein;  // the node to be replaced
        u32 clust_scarcity; // ore cluster has a 1-in-clust_scarcity chance of appearing at a node
@@ -128,6 +127,7 @@ class Ore {
        s16 clust_size;     // how large (in nodes) a chunk of ore is
        s16 height_min;
        s16 height_max;
+       u8 ore_param2;          // to set node-specific attributes
        u32 flags;          // attributes for this ore
        float nthresh;      // threshhold for noise at which an ore is placed 
        NoiseParams *np;    // noise for distribution of clusters (NULL for uniform scattering)
@@ -141,15 +141,19 @@ class Ore {
        }
        
        void resolveNodeNames(INodeDefManager *ndef);
-       virtual void generate(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) = 0;
+       void placeOre(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
+       virtual void generate(ManualMapVoxelManipulator *vm, int seed,
+                                               u32 blockseed, v3s16 nmin, v3s16 nmax) = 0;
 };
 
 class OreScatter : public Ore {
-        void generate(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
+       virtual void generate(ManualMapVoxelManipulator *vm, int seed,
+                                               u32 blockseed, v3s16 nmin, v3s16 nmax);
 };
 
 class OreSheet : public Ore {
-       void generate(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
+       virtual void generate(ManualMapVoxelManipulator *vm, int seed,
+                                               u32 blockseed, v3s16 nmin, v3s16 nmax);
 };
 
 Ore *createOre(OreType type);