Make players respect makes_footstep_sound in the object properties

[minetest.git] / src / mapgen_v7.h

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index aee171b48c84178a4bf6f5a800fc0b5209ad64d5..71a341afe78cc6dd3c273f156cdab11ca9b97609 100644 (file)
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -23,18 +23,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "mapgen.h"
 
-/////////////////// Mapgen V7 flags
-#define MGV7_MOUNTAINS   0x01
-#define MGV7_RIDGES      0x02
+//////////// Mapgen V7 flags
+#define MGV7_MOUNTAINS  0x01
+#define MGV7_RIDGES     0x02
+#define MGV7_FLOATLANDS 0x04
+#define MGV7_CAVERNS    0x08
 
 class BiomeManager;
 
 extern FlagDesc flagdesc_mapgen_v7[];
 
 
-struct MapgenV7Params : public MapgenSpecificParams {
+struct MapgenV7Params : public MapgenParams {
        u32 spflags;
        float cave_width;
+       float float_mount_density;
+       float float_mount_height;
+       s16 floatland_level;
+       s16 shadow_limit;
+       s16 cavern_limit;
+       s16 cavern_taper;
+       float cavern_threshold;
+
        NoiseParams np_terrain_base;
        NoiseParams np_terrain_alt;
        NoiseParams np_terrain_persist;
@@ -42,8 +52,11 @@ struct MapgenV7Params : public MapgenSpecificParams {
        NoiseParams np_filler_depth;
        NoiseParams np_mount_height;
        NoiseParams np_ridge_uwater;
+       NoiseParams np_floatland_base;
+       NoiseParams np_float_base_height;
        NoiseParams np_mountain;
        NoiseParams np_ridge;
+       NoiseParams np_cavern;
        NoiseParams np_cave1;
        NoiseParams np_cave2;
 
@@ -56,9 +69,11 @@ struct MapgenV7Params : public MapgenSpecificParams {
 
 class MapgenV7 : public MapgenBasic {
 public:
-       MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+       MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge);
        ~MapgenV7();
 
+       virtual MapgenType getType() const { return MAPGEN_V7; }
+
        virtual void makeChunk(BlockMakeData *data);
        int getSpawnLevelAtPoint(v2s16 p);
 
@@ -66,36 +81,28 @@ class MapgenV7 : public MapgenBasic {
        float baseTerrainLevelFromMap(int index);
        bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z);
        bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
+       bool getFloatlandMountainFromMap(int idx_xyz, int idx_xz, s16 y);
+       void floatBaseExtentFromMap(s16 *float_base_min, s16 *float_base_max, int idx_xz);
+
        int generateTerrain();
        void generateRidgeTerrain();
 
 private:
+       float float_mount_density;
+       float float_mount_height;
+       s16 floatland_level;
+       s16 shadow_limit;
+
        Noise *noise_terrain_base;
        Noise *noise_terrain_alt;
        Noise *noise_terrain_persist;
        Noise *noise_height_select;
        Noise *noise_mount_height;
        Noise *noise_ridge_uwater;
+       Noise *noise_floatland_base;
+       Noise *noise_float_base_height;
        Noise *noise_mountain;
        Noise *noise_ridge;
-
-       content_t c_cobble;
-       content_t c_stair_cobble;
-       content_t c_mossycobble;
-       content_t c_sandstonebrick;
-       content_t c_stair_sandstonebrick;
-};
-
-struct MapgenFactoryV7 : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-       {
-               return new MapgenV7(mgid, params, emerge);
-       };
-
-       MapgenSpecificParams *createMapgenParams()
-       {
-               return new MapgenV7Params();
-       };
 };
 
 #endif