Pre-select current game in world creation dialog

[dragonfireclient.git] / src / mapgen_v6.h

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index 34de7c0ed6e87fbf25c0213f4edb8b8da8d345a0..a0276fb591d007ea511655a8eb9e9509ead69e86 100644 (file)
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen.h"
 
 #define AVERAGE_MUD_AMOUNT 4
-#define VMANIP_FLAG_CAVE VOXELFLAG_CHECKED1
 
 enum BiomeType
 {
@@ -43,16 +42,6 @@ extern NoiseParams nparams_v6_def_humidity;
 extern NoiseParams nparams_v6_def_trees;
 extern NoiseParams nparams_v6_def_apple_trees;
 
-struct Cave {
-       s16 min_tunnel_diameter;
-       s16 max_tunnel_diameter;
-       int dswitchint;
-       u16 tunnel_routepoints;
-       int part_max_length_rs;
-       bool large_cave_is_flat;
-       bool flooded;
-};
-
 struct MapgenV6Params : public MapgenParams {
        float freq_desert;
        float freq_beach;
@@ -91,6 +80,8 @@ struct MapgenV6Params : public MapgenParams {
 
 class MapgenV6 : public Mapgen {
 public:
+       EmergeManager *emerge;
+
        int ystride;
        v3s16 csize;
        u32 flags;
@@ -128,7 +119,7 @@ class MapgenV6 : public Mapgen {
        content_t c_desert_sand;
        content_t c_desert_stone;
 
-       MapgenV6(int mapgenid, MapgenV6Params *params);
+       MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge);
        ~MapgenV6();
        
        void makeChunk(BlockMakeData *data);
@@ -157,21 +148,20 @@ class MapgenV6 : public Mapgen {
        
        u32 get_blockseed(u64 seed, v3s16 p);
        
-       
        virtual void calculateNoise();
        int generateGround();
        void addMud();
        void flowMud(s16 &mudflow_minpos, s16 &mudflow_maxpos);
        void addDirtGravelBlobs();
        void growGrass();
-       void placeTrees();
-       virtual void defineCave(Cave & cave, PseudoRandom ps, v3s16 node_min, bool large_cave);
-       void generateCaves(int max_stone_y);
+       void placeTreesAndJungleGrass();
+       virtual void generateCaves(int max_stone_y);
+       virtual void generateExperimental() {}
 };
 
 struct MapgenFactoryV6 : public MapgenFactory {
        Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) {
-               return new MapgenV6(mgid, (MapgenV6Params *)params);
+               return new MapgenV6(mgid, (MapgenV6Params *)params, emerge);
        };
        
        MapgenParams *createMapgenParams() {