X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmapgen.h;h=3c897e02315a58c58b3ea5d42d2e4d826070fb22;hb=e5b4748bb44a12fd09a92f7d36986b4bda86e6bf;hp=4cee3c2aafaa7deb3d834d5be89ab7c5c366a3d1;hpb=5a34f40d80ea1a339b599bc11db549a6bd86912f;p=oweals%2Fminetest.git

diff --git a/src/mapgen.h b/src/mapgen.h
index 4cee3c2aa..3c897e023 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -35,7 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MG_CAVES         0x02
 #define MG_DUNGEONS      0x04
 #define MG_FLAT          0x08
-#define MG_NOLIGHT       0x10
+#define MG_LIGHT         0x10
 
 /////////////////// Ore generation flags
 // Use absolute value of height to determine ore placement
@@ -114,11 +114,11 @@ struct MapgenParams {
 	MapgenSpecificParams *sparams;
 
 	MapgenParams() {
-		mg_name     = "v6";
+		mg_name     = DEFAULT_MAPGEN;
 		seed        = 0;
 		water_level = 1;
 		chunksize   = 5;
-		flags       = MG_TREES | MG_CAVES;
+		flags       = MG_TREES | MG_CAVES | MG_LIGHT;
 		sparams     = NULL;
 	}
 };
@@ -209,7 +209,7 @@ Ore *createOre(OreType type);
 
 
 enum DecorationType {
-	DECO_SIMPLE,
+	DECO_SIMPLE = 1,
 	DECO_SCHEMATIC,
 	DECO_LSYSTEM
 };
@@ -313,7 +313,7 @@ public:
 	void saveSchematicFile(INodeDefManager *ndef);
 
 	bool getSchematicFromMap(Map *map, v3s16 p1, v3s16 p2);
-	void placeStructure(Map *map, v3s16 p);
+	void placeStructure(Map *map, v3s16 p, bool force_placement);
 	void applyProbabilities(v3s16 p0,
 		std::vector<std::pair<v3s16, u8> > *plist,
 		std::vector<std::pair<s16, u8> > *splist);