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 7b1e3102062593e4774b6293eb05bfa8a7e59ffb..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
 {
@@ -35,11 +34,13 @@ extern NoiseParams nparams_v6_def_terrain_base;
 extern NoiseParams nparams_v6_def_terrain_higher;
 extern NoiseParams nparams_v6_def_steepness;
 extern NoiseParams nparams_v6_def_height_select;
-extern NoiseParams nparams_v6_def_trees;
 extern NoiseParams nparams_v6_def_mud;
 extern NoiseParams nparams_v6_def_beach;
 extern NoiseParams nparams_v6_def_biome;
 extern NoiseParams nparams_v6_def_cave;
+extern NoiseParams nparams_v6_def_humidity;
+extern NoiseParams nparams_v6_def_trees;
+extern NoiseParams nparams_v6_def_apple_trees;
 
 struct MapgenV6Params : public MapgenParams {
        float freq_desert;
@@ -48,12 +49,14 @@ struct MapgenV6Params : public MapgenParams {
        NoiseParams *np_terrain_higher;
        NoiseParams *np_steepness;
        NoiseParams *np_height_select;
-       NoiseParams *np_trees;
        NoiseParams *np_mud;
        NoiseParams *np_beach;
        NoiseParams *np_biome;
        NoiseParams *np_cave;
-
+       NoiseParams *np_humidity;
+       NoiseParams *np_trees;
+       NoiseParams *np_apple_trees;
+       
        MapgenV6Params() {
                freq_desert       = 0.45;
                freq_beach        = 0.15;
@@ -61,11 +64,14 @@ struct MapgenV6Params : public MapgenParams {
                np_terrain_higher = &nparams_v6_def_terrain_higher;
                np_steepness      = &nparams_v6_def_steepness;
                np_height_select  = &nparams_v6_def_height_select;
-               np_trees          = &nparams_v6_def_trees;
                np_mud            = &nparams_v6_def_mud;
                np_beach          = &nparams_v6_def_beach;
                np_biome          = &nparams_v6_def_biome;
                np_cave           = &nparams_v6_def_cave;
+               np_humidity       = &nparams_v6_def_humidity;
+               np_trees          = &nparams_v6_def_trees;
+               np_apple_trees    = &nparams_v6_def_apple_trees;
+
        }
        
        bool readParams(Settings *settings);
@@ -74,6 +80,8 @@ struct MapgenV6Params : public MapgenParams {
 
 class MapgenV6 : public Mapgen {
 public:
+       EmergeManager *emerge;
+
        int ystride;
        v3s16 csize;
        u32 flags;
@@ -90,11 +98,13 @@ class MapgenV6 : public Mapgen {
        Noise *noise_terrain_higher;
        Noise *noise_steepness;
        Noise *noise_height_select;
-       Noise *noise_trees;
        Noise *noise_mud;
        Noise *noise_beach;
        Noise *noise_biome;
        NoiseParams *np_cave;
+       NoiseParams *np_humidity;
+       NoiseParams *np_trees;
+       NoiseParams *np_apple_trees;
        float freq_desert;
        float freq_beach;
        
@@ -109,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);
@@ -117,19 +127,20 @@ class MapgenV6 : public Mapgen {
 
        float baseTerrainLevel(float terrain_base, float terrain_higher,
                                                   float steepness, float height_select);
-       float baseTerrainLevelFromNoise(v2s16 p);
-       float baseTerrainLevelFromMap(v2s16 p);
-       float baseTerrainLevelFromMap(int index);
+       virtual float baseTerrainLevelFromNoise(v2s16 p);
+       virtual float baseTerrainLevelFromMap(v2s16 p);
+       virtual float baseTerrainLevelFromMap(int index);
 
        s16 find_ground_level(v2s16 p2d);
        s16 find_stone_level(v2s16 p2d);
        bool block_is_underground(u64 seed, v3s16 blockpos);
        s16 find_ground_level_from_noise(u64 seed, v2s16 p2d, s16 precision);
        
+       float getHumidity(v2s16 p);
        float getTreeAmount(v2s16 p);
-       float getTreeAmount(int index);
+       bool getHaveAppleTree(v2s16 p);
        float getMudAmount(v2s16 p);
-       float getMudAmount(int index);
+       virtual float getMudAmount(int index);
        bool getHaveBeach(v2s16 p);
        bool getHaveBeach(int index);
        BiomeType getBiome(v2s16 p);
@@ -137,20 +148,20 @@ class MapgenV6 : public Mapgen {
        
        u32 get_blockseed(u64 seed, v3s16 p);
        
-       
-       void calculateNoise();
+       virtual void calculateNoise();
        int generateGround();
        void addMud();
        void flowMud(s16 &mudflow_minpos, s16 &mudflow_maxpos);
        void addDirtGravelBlobs();
        void growGrass();
-       void placeTrees();
-       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() {