Works for debian and a few other distributions but fails for even more so back to...

[minetest.git] / src / mapgen_v7.h

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index e39bf715857b0f5cabf42f62f608f47c455c1de4..a7c80928f83e172a6ea8a26a283773ec48027c7d 100644 (file)
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -22,33 +22,30 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "mapgen.h"
 
-extern NoiseParams nparams_v7_def_terrain_base;
-extern NoiseParams nparams_v7_def_terrain_alt;
-extern NoiseParams nparams_v7_def_terrain_mod;
-extern NoiseParams nparams_v7_def_terrain_persist;
-extern NoiseParams nparams_v7_def_height_select;
-extern NoiseParams nparams_v7_def_ridge;
-
-struct MapgenV7Params : public MapgenParams {
+/////////////////// Mapgen V7 flags
+#define MGV7_MOUNTAINS   0x01
+#define MGV7_RIDGES      0x02
+
+
+extern FlagDesc flagdesc_mapgen_v7[];
+
+
+struct MapgenV7Params : public MapgenSpecificParams {
+       u32 spflags;
        NoiseParams np_terrain_base;
        NoiseParams np_terrain_alt;
-       NoiseParams np_terrain_mod;
        NoiseParams np_terrain_persist;
        NoiseParams np_height_select;
+       NoiseParams np_filler_depth;
+       NoiseParams np_mount_height;
+       NoiseParams np_ridge_uwater;
+       NoiseParams np_mountain;
        NoiseParams np_ridge;
        
-       MapgenV7Params() {
-               np_terrain_base    = nparams_v7_def_terrain_base;
-               np_terrain_alt     = nparams_v7_def_terrain_alt;
-               np_terrain_mod     = nparams_v7_def_terrain_mod;
-               np_terrain_persist = nparams_v7_def_terrain_persist;
-               np_height_select   = nparams_v7_def_height_select;
-               np_ridge           = nparams_v7_def_ridge;
-       }
-       
+       MapgenV7Params();
        ~MapgenV7Params() {}
        
-       bool readParams(Settings *settings);
+       void readParams(Settings *settings);
        void writeParams(Settings *settings);
 };
 
@@ -58,8 +55,9 @@ class MapgenV7 : public Mapgen {
        BiomeDefManager *bmgr;
 
        int ystride;
+       int zstride;
        u32 flags;
-       bool ridges;
+       u32 spflags;
 
        u32 blockseed;
        v3s16 node_min;
@@ -71,10 +69,12 @@ class MapgenV7 : public Mapgen {
        
        Noise *noise_terrain_base;
        Noise *noise_terrain_alt;
-       Noise *noise_terrain_mod;
        Noise *noise_terrain_persist;
        Noise *noise_height_select;
-       
+       Noise *noise_filler_depth;
+       Noise *noise_mount_height;
+       Noise *noise_ridge_uwater;
+       Noise *noise_mountain;
        Noise *noise_ridge;
        
        Noise *noise_heat;
@@ -86,12 +86,13 @@ class MapgenV7 : public Mapgen {
        content_t c_sand;
        content_t c_water_source;
        content_t c_lava_source;
+       content_t c_ice;
        content_t c_gravel;
        content_t c_cobble;
        content_t c_desert_sand;
        content_t c_desert_stone;
 
-       MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge);
+       MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
        ~MapgenV7();
        
        virtual void makeChunk(BlockMakeData *data);
@@ -100,25 +101,30 @@ class MapgenV7 : public Mapgen {
 
        float baseTerrainLevelAtPoint(int x, int z);
        float baseTerrainLevelFromMap(int index);
+       bool getMountainTerrainAtPoint(int x, int y, int z);
+       bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, int y);
+       
        void calculateNoise();
-       int calcHeightMap();
        
-       virtual void generateTerrain();
-       void carveRidges();
-       //void carveRivers(); //experimental
+       virtual int generateTerrain();
+       int generateBaseTerrain();
+       void generateMountainTerrain();
+       void generateRidgeTerrain();
+       
+       void generateBiomes();
+       void dustTopNodes();
        
-       void testBiomes();
-       void addTopNodes();
+       //void addTopNodes();
        
        void generateCaves(int max_stone_y);
 };
 
 struct MapgenFactoryV7 : public MapgenFactory {
        Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) {
-               return new MapgenV7(mgid, (MapgenV7Params *)params, emerge);
+               return new MapgenV7(mgid, params, emerge);
        };
        
-       MapgenParams *createMapgenParams() {
+       MapgenSpecificParams *createMapgenParams() {
                return new MapgenV7Params();
        };
 };