Pre-select current game in world creation dialog

[dragonfireclient.git] / src / mapgen.h

diff --git a/src/mapgen.h b/src/mapgen.h
index a900985da5bfbb44586e646d747d0e1a1bc2ffce..17136a13796c704de70ca44166752f51d923b0e5 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -36,7 +36,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MGV6_BIOME_BLEND 0x10
 #define MG_FLAT          0x20
 
+/////////////////// Ore generation flags
+// Use absolute value of height to determine ore placement
+#define OREFLAG_ABSHEIGHT 0x01 
+// Use 3d noise to get density of ore placement, instead of just the position
+#define OREFLAG_DENSITY   0x02 // not yet implemented
+// For claylike ore types, place ore if the number of surrounding
+// nodes isn't the specified node
+#define OREFLAG_NODEISNT  0x04 // not yet implemented
+
 extern FlagDesc flagdesc_mapgen[];
+extern FlagDesc flagdesc_ore[];
 
 class BiomeDefManager;
 class Biome;
@@ -103,18 +113,22 @@ enum OreType {
        ORE_CLAYLIKE
 };
 
+#define ORE_RANGE_ACTUAL 1
+#define ORE_RANGE_MIRROR 2
+
 class Ore {
 public:
        std::string ore_name;
        std::string wherein_name;
-
        content_t ore;
        content_t wherein;  // the node to be replaced
-       s16 clust_scarcity; //
+       u32 clust_scarcity; // ore cluster has a 1-in-clust_scarcity chance of appearing at a node
        s16 clust_num_ores; // how many ore nodes are in a chunk
        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)
        Noise *noise;
@@ -127,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);