minetest/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2025-09-19 19:55:19 +02:00
Code Issues Releases Wiki Activity

Re-order mapgens in mainmenu and 'all settings' mapgen selection (#8705)

Browse Source 
v6 always last to discourage selection.
Special mapgens flat, fractal, singlenode, next to last. Of these, singlenode
last to discourage selection.
Of the remaining, v5 last due to age, v7 first due to being the default.
This commit is contained in:
Paramat
2019-07-25 20:46:28 +01:00
committed by GitHub
parent 245a31d6b7
commit 0cde6fc552
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mapgen/mapgen.cpp
View File

@@ -81,15 +81,21 @@ struct MapgenDesc {
//// Built-in mapgens
////
// Order used here defines the order of appearence in mainmenu.
// v6 always last to discourage selection.
// Special mapgens flat, fractal, singlenode, next to last. Of these, singlenode
// last to discourage selection.
// Of the remaining, v5 last due to age, v7 first due to being the default.
// The order of 'enum MapgenType' in mapgen.h must match this order.
static MapgenDesc g_reg_mapgens[] = {
{"v5", true},
{"v6", true},
{"v7", true},
{"valleys", true},
{"carpathian", true},
{"v5", true},
{"flat", true},
{"fractal", true},
{"valleys", true},
{"singlenode", true},
{"carpathian", true},
{"v6", true},
};
STATIC_ASSERT(

9
src/mapgen/mapgen.h
View File

@@ -102,15 +102,16 @@ private:
std::list<GenNotifyEvent> m_notify_events;
};
// Order must match the order of 'static MapgenDesc g_reg_mapgens[]' in mapgen.cpp
enum MapgenType {
MAPGEN_V5,
MAPGEN_V6,
MAPGEN_V7,
MAPGEN_VALLEYS,
MAPGEN_CARPATHIAN,
MAPGEN_V5,
MAPGEN_FLAT,
MAPGEN_FRACTAL,
MAPGEN_VALLEYS,
MAPGEN_SINGLENODE,
MAPGEN_CARPATHIAN,
MAPGEN_V6,
MAPGEN_INVALID,
};