Change mapgen list, hide deprecated

builtin/mainmenu/dlg_create_world.lua

@@ -16,15 +16,7 @@
 --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 local function create_world_formspec(dialogdata)
-	local mapgens = {}
-	local mapgens_available = core.settings:get("mapgens_available")
-	if mapgens_available then
-		for mg in string.gmatch(mapgens_available, '[^,%s]+') do
-			table.insert(mapgens, mg)
-		end
-	else
-		mapgens = core.get_mapgen_names()
-	end
+	local mapgens = core.get_mapgen_names()
 	local current_seed = core.settings:get("fixed_map_seed") or ""
 	local current_mg   = core.settings:get("mg_name")
 

multicraft.conf.example

@@ -1167,11 +1167,6 @@
 
 ## Mapgen
 
-#    Available map generators, can be used to restrict mapgens unsuitable
-#    for specific platforms and devices
-
-# mapgens_available = v6, v7p, flat
-
 #    Name of map generator to be used when creating a new world.
 #    Creating a world in the main menu will override this.
 #    type: enum values: v5, v6, v7, flat, valleys, fractal, singlenode

src/defaultsettings.cpp

@@ -373,7 +373,6 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("enable_console", "false");
 
 	settings->setDefault("mainmenu_last_selected_world", "1");
-	settings->setDefault("mapgens_available", "v7p, flat, v7, v6");
 
 	// Mobile Platform
 #if defined(__ANDROID__) || defined(__IOS__)
@@ -391,7 +390,6 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("emergequeue_limit_generate", "16");
 	settings->setDefault("curl_verify_cert", "false");
 	settings->setDefault("gui_scaling_filter_txr2img", "false");
-	settings->setDefault("mapgens_available", "v7p, flat");
 
 	// FIXME: this code should be in init_gettext() ideally
 	char lang[3] = {0};

src/mapgen.cpp

@@ -79,16 +79,29 @@ struct MapgenDesc {
 //// Built-in mapgens
 ////
 
-static MapgenDesc g_reg_mapgens[] = {
-	{"v5",         true},
-	{"v6",         true},
-	{"v7",         true},
-	{"v7p",        true},
-	{"flat",       true},
-	{"fractal",    true},
-	{"valleys",    true},
-	{"singlenode", true},
-};
+#if defined(__ANDROID__) || defined(__IOS__)
+	static MapgenDesc g_reg_mapgens[] = {
+		{"v7p",        true},
+		{"flat",       true},
+		{"valleys",    true},
+		{"v5",         false},
+		{"v6",         false},
+		{"v7",         false},
+		{"fractal",    false},
+		{"singlenode", false},
+	};
+#else
+	static MapgenDesc g_reg_mapgens[] = {
+		{"v7p",        true},
+		{"flat",       true},
+		{"valleys",    true},
+		{"v5",         true},
+		{"v6",         true},
+		{"v7",         true},
+		{"fractal",    true},
+		{"singlenode", true},
+	};
+#endif
 
 STATIC_ASSERT(
 	ARRLEN(g_reg_mapgens) == MAPGEN_INVALID,

src/mapgen.h

@@ -111,13 +111,13 @@ private:
 };
 
 enum MapgenType {
+	MAPGEN_V7P,
+	MAPGEN_FLAT,
+	MAPGEN_VALLEYS,
 	MAPGEN_V5,
 	MAPGEN_V6,
 	MAPGEN_V7,
-	MAPGEN_V7P,
-	MAPGEN_FLAT,
 	MAPGEN_FRACTAL,
-	MAPGEN_VALLEYS,
 	MAPGEN_SINGLENODE,
 	MAPGEN_INVALID,
 };