Fix MSVC build

[dragonfireclient.git] / src / mapgen_v6.h

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index 89a3324cd6d0cb74692e7d0d58bea96c08e28b6f..eecfb1fe6d91bd477f49a59004478ebd29b4abf1 100644 (file)
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -21,79 +21,55 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MAPGENV6_HEADER
 
 #include "mapgen.h"
+#include "noise.h"
 
 #define AVERAGE_MUD_AMOUNT 4
-#define VMANIP_FLAG_CAVE VOXELFLAG_CHECKED1
 
-enum BiomeType
+/////////////////// Mapgen V6 flags
+#define MGV6_JUNGLES    0x01
+#define MGV6_BIOMEBLEND 0x02
+#define MGV6_MUDFLOW    0x04
+
+
+extern FlagDesc flagdesc_mapgen_v6[];
+
+
+enum BiomeV6Type
 {
        BT_NORMAL,
        BT_DESERT
 };
 
-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_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 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 {
+struct MapgenV6Params : public MapgenSpecificParams {
+       u32 spflags;
        float freq_desert;
        float freq_beach;
-       NoiseParams *np_terrain_base;
-       NoiseParams *np_terrain_higher;
-       NoiseParams *np_steepness;
-       NoiseParams *np_height_select;
-       NoiseParams *np_mud;
-       NoiseParams *np_beach;
-       NoiseParams *np_biome;
-       NoiseParams *np_cave;
-       NoiseParams *np_humidity;
-       NoiseParams *np_trees;
-       NoiseParams *np_apple_trees;
+       NoiseParams np_terrain_base;
+       NoiseParams np_terrain_higher;
+       NoiseParams np_steepness;
+       NoiseParams np_height_select;
+       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;
-               np_terrain_base   = &nparams_v6_def_terrain_base;
-               np_terrain_higher = &nparams_v6_def_terrain_higher;
-               np_steepness      = &nparams_v6_def_steepness;
-               np_height_select  = &nparams_v6_def_height_select;
-               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;
-
-       }
+       MapgenV6Params();
+       ~MapgenV6Params() {}
        
-       bool readParams(Settings *settings);
+       void readParams(Settings *settings);
        void writeParams(Settings *settings);
 };
 
 class MapgenV6 : public Mapgen {
 public:
+       EmergeManager *emerge;
+
        int ystride;
-       v3s16 csize;
        u32 flags;
+       u32 spflags;
 
        u32 blockseed;
        v3s16 node_min;
@@ -116,7 +92,7 @@ class MapgenV6 : public Mapgen {
        NoiseParams *np_apple_trees;
        float freq_desert;
        float freq_beach;
-       
+
        content_t c_stone;
        content_t c_dirt;
        content_t c_dirt_with_grass;
@@ -128,7 +104,12 @@ class MapgenV6 : public Mapgen {
        content_t c_desert_sand;
        content_t c_desert_stone;
 
-       MapgenV6(int mapgenid, MapgenV6Params *params);
+       content_t c_mossycobble;
+       content_t c_sandbrick;
+       content_t c_stair_cobble;
+       content_t c_stair_sandstone;
+
+       MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge);
        ~MapgenV6();
        
        void makeChunk(BlockMakeData *data);
@@ -140,7 +121,6 @@ class MapgenV6 : public Mapgen {
        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);
@@ -152,8 +132,8 @@ class MapgenV6 : public Mapgen {
        virtual float getMudAmount(int index);
        bool getHaveBeach(v2s16 p);
        bool getHaveBeach(int index);
-       BiomeType getBiome(v2s16 p);
-       BiomeType getBiome(int index, v2s16 p);
+       BiomeV6Type getBiome(v2s16 p);
+       BiomeV6Type getBiome(int index, v2s16 p);
        
        u32 get_blockseed(u64 seed, v3s16 p);
        
@@ -164,18 +144,16 @@ class MapgenV6 : public Mapgen {
        void addDirtGravelBlobs();
        void growGrass();
        void placeTreesAndJungleGrass();
-       virtual void defineCave(Cave &cave, PseudoRandom ps,
-                                                       v3s16 node_min, bool large_cave);
-       void generateCaves(int max_stone_y);
-       virtual void generateSomething() {}; //for next mapgen
+       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, params, emerge);
        };
        
-       MapgenParams *createMapgenParams() {
+       MapgenSpecificParams *createMapgenParams() {
                return new MapgenV6Params();
        };
 };