X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapgen.h;h=7aac1e6a06a10102d4327a429f2904ed8363c5fa;hb=c4b98deb616fbe204c503d678fb920baa33cbede;hp=618a2f6b8996adbc2965f0634856320faa16b90c;hpb=92705306bfb4994107a43514f29997cea15d48dc;p=minetest.git

diff --git a/src/mapgen.h b/src/mapgen.h
index 618a2f6b8..7aac1e6a0 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -26,14 +26,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/string.h"
 #include "util/container.h"
 
-#define MAPGEN_DEFAULT MAPGEN_V6
-#define MAPGEN_DEFAULT_NAME "v6"
+#define MAPGEN_DEFAULT MAPGEN_V7
+#define MAPGEN_DEFAULT_NAME "v7"
 
 /////////////////// Mapgen flags
-#define MG_TREES       0x01
+#define MG_TREES       0x01  // Deprecated. Moved into mgv6 flags
 #define MG_CAVES       0x02
 #define MG_DUNGEONS    0x04
-#define MG_FLAT        0x08
+#define MG_FLAT        0x08  // Deprecated. Moved into mgv6 flags
 #define MG_LIGHT       0x10
 #define MG_DECORATIONS 0x20
 
@@ -119,37 +119,29 @@ enum MapgenType {
 	MAPGEN_INVALID,
 };
 
-struct MapgenSpecificParams {
-	virtual void readParams(const Settings *settings) = 0;
-	virtual void writeParams(Settings *settings) const = 0;
-	virtual ~MapgenSpecificParams() {}
-};
-
 struct MapgenParams {
-	std::string mg_name;
+	MapgenType mgtype;
 	s16 chunksize;
 	u64 seed;
 	s16 water_level;
 	u32 flags;
 
 	BiomeParams *bparams;
-	MapgenSpecificParams *sparams;
 
 	MapgenParams() :
-		mg_name(MAPGEN_DEFAULT_NAME),
+		mgtype(MAPGEN_DEFAULT),
 		chunksize(5),
 		seed(0),
 		water_level(1),
 		flags(MG_CAVES | MG_LIGHT | MG_DECORATIONS),
-		bparams(NULL),
-		sparams(NULL)
+		bparams(NULL)
 	{
 	}
 
 	virtual ~MapgenParams();
 
-	void load(const Settings &settings);
-	void save(Settings &settings) const;
+	virtual void readParams(const Settings *settings);
+	virtual void writeParams(Settings *settings) const;
 };
 
 
@@ -217,7 +209,7 @@ class Mapgen {
 	static const char *getMapgenName(MapgenType mgtype);
 	static Mapgen *createMapgen(MapgenType mgtype, int mgid,
 		MapgenParams *params, EmergeManager *emerge);
-	static MapgenSpecificParams *createMapgenParams(MapgenType mgtype);
+	static MapgenParams *createMapgenParams(MapgenType mgtype);
 	static void getMapgenNames(std::vector<const char *> *mgnames, bool include_hidden);
 
 private:
@@ -274,8 +266,9 @@ class MapgenBasic : public Mapgen {
 	content_t c_cobble;
 	content_t c_stair_cobble;
 	content_t c_mossycobble;
+	content_t c_stair_desert_stone;
 	content_t c_sandstonebrick;
-	content_t c_stair_sandstonebrick;
+	content_t c_stair_sandstone_block;
 
 	int ystride;
 	int zstride;