-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;
+/////////////////// 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_persist;
+ NoiseParams np_height_select;
+ NoiseParams np_filler_depth;
+ NoiseParams np_mount_height;
+ NoiseParams np_ridge_uwater;
+ NoiseParams np_mountain;
+ NoiseParams np_ridge;