From: paramat <mat.gregory@virginmedia.com>
Date: Sun, 10 Jan 2016 03:27:32 +0000 (+0000)
Subject: Mgflat: Set blank default spflags. Unhide
X-Git-Tag: 0.4.14~329
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3e0ea3c6eda27a7b6535570c2c208213be046494;p=oweals%2Fminetest.git

Mgflat: Set blank default spflags. Unhide
---

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 6412ab4f6..06d473808 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -936,7 +936,7 @@ mgv7_np_cave2 (Mapgen v7 cave2 noise parameters) noise_params 0, 12, (100, 100,
 #    Occasional lakes and hills added to the flat world.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with "no" are used to explicitly disable them.
-mgflat_spflags (Mapgen flat flags) flags nolakes,nohills lakes,hills,nolakes,nohills
+mgflat_spflags (Mapgen flat flags) flags  lakes,hills,,nolakes,nohills
 
 #    Y of flat ground.
 mgflat_ground_level (Mapgen flat ground level) int 8
diff --git a/minetest.conf.example b/minetest.conf.example
index 806ce62c2..bea9b4ac3 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1187,8 +1187,8 @@
 #    Occasional lakes and hills added to the flat world.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with "no" are used to explicitly disable them.
-#    type: flags possible values: lakes, hills, nolakes, nohills
-# mgflat_spflags = nolakes,nohills
+#    type: flags possible values: lakes, hills, , nolakes, nohills
+# mgflat_spflags = 
 
 #    Y of flat ground.
 #    type: int
diff --git a/src/emerge.cpp b/src/emerge.cpp
index 6d4d84d7f..157be2e64 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -106,7 +106,7 @@ MapgenDesc g_reg_mapgens[] = {
 	{"v5",         new MapgenFactoryV5,         true},
 	{"v6",         new MapgenFactoryV6,         true},
 	{"v7",         new MapgenFactoryV7,         true},
-	{"flat",       new MapgenFactoryFlat,       false},
+	{"flat",       new MapgenFactoryFlat,       true},
 	{"fractal",    new MapgenFactoryFractal,    true},
 	{"singlenode", new MapgenFactorySinglenode, false},
 };