Fix formspec field labels

[dragonfireclient.git] / src / mapgen_v7.h

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 73fa9be0392b5b0745b9fc7428672f3d14bcc083..e7a72e464655ee34fa0762d837b1a10300dcf748 100644 (file)
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -24,28 +24,39 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 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_filler_depth;
+extern NoiseParams nparams_v7_def_mount_height;
+extern NoiseParams nparams_v7_def_ridge_uwater;
+extern NoiseParams nparams_v7_def_mountain;
 extern NoiseParams nparams_v7_def_ridge;
 
 struct MapgenV7Params : public MapgenParams {
-       NoiseParams *np_terrain_base;
-       NoiseParams *np_terrain_alt;
-       NoiseParams *np_terrain_mod;
-       NoiseParams *np_terrain_persist;
-       NoiseParams *np_height_select;
-       NoiseParams *np_ridge;
+       NoiseParams np_terrain_base;
+       NoiseParams np_terrain_alt;
+       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;
+               np_terrain_base    = nparams_v7_def_terrain_base;
+               np_terrain_alt     = nparams_v7_def_terrain_alt;
+               np_terrain_persist = nparams_v7_def_terrain_persist;
+               np_height_select   = nparams_v7_def_height_select;
+               np_filler_depth    = nparams_v7_def_filler_depth;
+               np_mount_height    = nparams_v7_def_mount_height;
+               np_ridge_uwater    = nparams_v7_def_ridge_uwater;
+               np_mountain        = nparams_v7_def_mountain;
+               np_ridge           = nparams_v7_def_ridge;
        }
        
+       ~MapgenV7Params() {}
+       
        bool readParams(Settings *settings);
        void writeParams(Settings *settings);
 };
@@ -56,7 +67,7 @@ class MapgenV7 : public Mapgen {
        BiomeDefManager *bmgr;
 
        int ystride;
-       v3s16 csize;
+       int zstride;
        u32 flags;
 
        u32 blockseed;
@@ -65,16 +76,16 @@ class MapgenV7 : public Mapgen {
        v3s16 full_node_min;
        v3s16 full_node_max;
        
-       s16 *heightmap;
        s16 *ridge_heightmap;
-       u8 *biomemap;
        
        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,6 +97,7 @@ 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;
@@ -94,22 +106,28 @@ class MapgenV7 : public Mapgen {
        MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge);
        ~MapgenV7();
        
-       void makeChunk(BlockMakeData *data);
+       virtual void makeChunk(BlockMakeData *data);
        int getGroundLevelAtPoint(v2s16 p);
        Biome *getBiomeAtPoint(v3s16 p);
 
        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();
        
-       void generateTerrain();
-       void carveRidges();
-       //void carveRivers(); //experimental
+       virtual int generateTerrain();
+       int generateBaseTerrain();
+       void generateMountainTerrain();
+       void generateRidgeTerrain();
+       
+       void generateBiomes();
+       void dustTopNodes();
+       
+       //void addTopNodes();
        
-       void testBiomes();
-       void addTopNodes();
-       void growGrass();
+       void generateCaves(int max_stone_y);
 };
 
 struct MapgenFactoryV7 : public MapgenFactory {