Remove blank default values for emergequeue_limit_* settings

[dragonfireclient.git] / src / mapgen.h

diff --git a/src/mapgen.h b/src/mapgen.h
index 47a7204bc24b9697fa0370a88b74b04b7ce3160b..4cee3c2aafaa7deb3d834d5be89ab7c5c366a3d1 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -28,16 +28,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "noise.h"
 #include "settings.h"
 
+#define DEFAULT_MAPGEN "v6"
+
 /////////////////// Mapgen flags
 #define MG_TREES         0x01
 #define MG_CAVES         0x02
 #define MG_DUNGEONS      0x04
-#define MGV6_JUNGLES     0x08
-#define MGV6_BIOME_BLEND 0x10
-#define MG_FLAT          0x20
-#define MG_NOLIGHT       0x40
-#define MGV7_MOUNTAINS   0x80
-#define MGV7_RIDGES      0x100
+#define MG_FLAT          0x08
+#define MG_NOLIGHT       0x10
 
 /////////////////// Ore generation flags
 // Use absolute value of height to determine ore placement
@@ -53,9 +51,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define DECO_PLACE_CENTER_Y 2
 #define DECO_PLACE_CENTER_Z 4
 
+#define ORE_RANGE_ACTUAL 1
+#define ORE_RANGE_MIRROR 2
+
+#define NUM_GEN_NOTIFY 6
+
+
 extern FlagDesc flagdesc_mapgen[];
 extern FlagDesc flagdesc_ore[];
 extern FlagDesc flagdesc_deco_schematic[];
+extern FlagDesc flagdesc_gennotify[];
 
 class BiomeDefManager;
 class Biome;
@@ -67,6 +72,38 @@ struct BlockMakeData;
 class VoxelArea;
 class Map;
 
+
+enum MapgenObject {
+       MGOBJ_VMANIP,
+       MGOBJ_HEIGHTMAP,
+       MGOBJ_BIOMEMAP,
+       MGOBJ_HEATMAP,
+       MGOBJ_HUMIDMAP,
+       MGOBJ_GENNOTIFY
+};
+
+enum GenNotify {
+       GENNOTIFY_DUNGEON,
+       GENNOTIFY_TEMPLE,
+       GENNOTIFY_CAVE_BEGIN,
+       GENNOTIFY_CAVE_END,
+       GENNOTIFY_LARGECAVE_BEGIN,
+       GENNOTIFY_LARGECAVE_END
+};
+
+enum OreType {
+       ORE_SCATTER,
+       ORE_SHEET,
+       ORE_CLAYLIKE
+};
+
+
+struct MapgenSpecificParams {
+       virtual void readParams(Settings *settings) = 0;
+       virtual void writeParams(Settings *settings) = 0;
+       virtual ~MapgenSpecificParams() {}
+};
+
 struct MapgenParams {
        std::string mg_name;
        int chunksize;
@@ -74,17 +111,16 @@ struct MapgenParams {
        int water_level;
        u32 flags;
 
+       MapgenSpecificParams *sparams;
+
        MapgenParams() {
                mg_name     = "v6";
                seed        = 0;
                water_level = 1;
                chunksize   = 5;
-               flags       = MG_TREES | MG_CAVES | MGV6_BIOME_BLEND;
+               flags       = MG_TREES | MG_CAVES;
+               sparams     = NULL;
        }
-
-       virtual bool readParams(Settings *settings) { return true; }
-       virtual void writeParams(Settings *settings) {}
-       virtual ~MapgenParams() {}
 };
 
 class Mapgen {
@@ -100,8 +136,11 @@ class Mapgen {
        u8 *biomemap;
        v3s16 csize;
 
+       u32 gennotify;
+       std::vector<v3s16> *gen_notifications[NUM_GEN_NOTIFY];
+
        Mapgen();
-       virtual ~Mapgen() {}
+       virtual ~Mapgen();
 
        s16 findGroundLevelFull(v2s16 p2d);
        s16 findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax);
@@ -119,27 +158,10 @@ class Mapgen {
 struct MapgenFactory {
        virtual Mapgen *createMapgen(int mgid, MapgenParams *params,
                                                                 EmergeManager *emerge) = 0;
-       virtual MapgenParams *createMapgenParams() = 0;
+       virtual MapgenSpecificParams *createMapgenParams() = 0;
        virtual ~MapgenFactory() {}
 };
 
-enum MapgenObject {
-       MGOBJ_VMANIP,
-       MGOBJ_HEIGHTMAP,
-       MGOBJ_BIOMEMAP,
-       MGOBJ_HEATMAP,
-       MGOBJ_HUMIDMAP
-};
-
-enum OreType {
-       ORE_SCATTER,
-       ORE_SHEET,
-       ORE_CLAYLIKE
-};
-
-#define ORE_RANGE_ACTUAL 1
-#define ORE_RANGE_MIRROR 2
-
 class Ore {
 public:
        std::string ore_name;