Handle the newly added TOCLIENT_ACCESS_DENIED and TOCLIENT_DELETE_PARTICLESPAWNER

[minetest.git] / src / mapgen_v7.h

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 3391098ea9c7d42876cdaa52e65ca62156504c73..f5dc4ff2b80975bc03f9fdbdb44cb0baff1e48a1 100644 (file)
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -22,103 +22,118 @@ 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 {
-       NoiseParams *np_terrain_base;
-       NoiseParams *np_terrain_alt;
-       NoiseParams *np_terrain_mod;
-       NoiseParams *np_terrain_persist;
-       NoiseParams *np_height_select;
-       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;
-       }
-       
-       bool readParams(Settings *settings);
-       void writeParams(Settings *settings);
+/////////////////// Mapgen V7 flags
+#define MGV7_MOUNTAINS   0x01
+#define MGV7_RIDGES      0x02
+
+class BiomeManager;
+
+extern FlagDesc flagdesc_mapgen_v7[];
+
+
+struct MapgenV7Params : public MapgenSpecificParams {
+       u32 spflags;
+       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;
+       NoiseParams np_cave1;
+       NoiseParams np_cave2;
+
+       MapgenV7Params();
+       ~MapgenV7Params() {}
+
+       void readParams(const Settings *settings);
+       void writeParams(Settings *settings) const;
 };
 
 class MapgenV7 : public Mapgen {
 public:
-       EmergeManager *emerge;
-       BiomeDefManager *bmgr;
+       EmergeManager *m_emerge;
+       BiomeManager *bmgr;
 
        int ystride;
-       v3s16 csize;
-       u32 flags;
+       int zstride;
+       u32 spflags;
 
-       u32 blockseed;
        v3s16 node_min;
        v3s16 node_max;
        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_cave1;
+       Noise *noise_cave2;
+
        Noise *noise_heat;
        Noise *noise_humidity;
-       
+
        content_t c_stone;
        content_t c_dirt;
        content_t c_dirt_with_grass;
        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;
+       content_t c_mossycobble;
+       content_t c_sandbrick;
+       content_t c_stair_cobble;
+       content_t c_stair_sandstone;
 
-       MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge);
+       MapgenV7(int mapgenid, MapgenParams *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
-       
-       void testBiomes();
-       void addTopNodes();
-       
+
+       virtual int generateTerrain();
+       int generateBaseTerrain();
+       int generateMountainTerrain(int ymax);
+       void generateRidgeTerrain();
+
+       bool generateBiomes(float *heat_map, float *humidity_map);
+       void dustTopNodes();
+
+       //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);
+       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
+       {
+               return new MapgenV7(mgid, params, emerge);
        };
-       
-       MapgenParams *createMapgenParams() {
+
+       MapgenSpecificParams *createMapgenParams()
+       {
                return new MapgenV7Params();
        };
 };