aboutsummaryrefslogtreecommitdiff
path: root/builtin/mainmenu
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/mainmenu')
-rw-r--r--builtin/mainmenu/dlg_create_world.lua48
1 files changed, 35 insertions, 13 deletions
diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua
index 4e88ccc48..380f0654f 100644
--- a/builtin/mainmenu/dlg_create_world.lua
+++ b/builtin/mainmenu/dlg_create_world.lua
@@ -15,11 +15,39 @@
--with this program; if not, write to the Free Software Foundation, Inc.,
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+local worldname = ""
+
local function create_world_formspec(dialogdata)
local mapgens = core.get_mapgen_names()
local current_seed = core.settings:get("fixed_map_seed") or ""
local current_mg = core.settings:get("mg_name")
+ local gameid = core.settings:get("menu_last_game")
+
+ local game, gameidx = nil , 0
+ if gameid ~= nil then
+ game, gameidx = gamemgr.find_by_gameid(gameid)
+
+ if gameidx == nil then
+ gameidx = 0
+ end
+ end
+
+ local gamepath = core.get_game(gameidx).path
+ local gameconfig = Settings(gamepath.."/game.conf")
+
+ local disallowed_mapgens = (gameconfig:get("disallowed_mapgens") or ""):split()
+ for key, value in pairs(disallowed_mapgens) do
+ disallowed_mapgens[key] = value:trim()
+ end
+
+ if disallowed_mapgens then
+ for i = #mapgens, 1, -1 do
+ if table.indexof(disallowed_mapgens, mapgens[i]) > 0 then
+ table.remove(mapgens, i)
+ end
+ end
+ end
local mglist = ""
local selindex = 1
@@ -32,23 +60,12 @@ local function create_world_formspec(dialogdata)
mglist = mglist .. v .. ","
end
mglist = mglist:sub(1, -2)
-
- local gameid = core.settings:get("menu_last_game")
-
- local game, gameidx = nil , 0
- if gameid ~= nil then
- game, gameidx = gamemgr.find_by_gameid(gameid)
-
- if gameidx == nil then
- gameidx = 0
- end
- end
current_seed = core.formspec_escape(current_seed)
local retval =
"size[11.5,6.5,true]" ..
"label[2,0;" .. fgettext("World name") .. "]"..
- "field[4.5,0.4;6,0.5;te_world_name;;]" ..
+ "field[4.5,0.4;6,0.5;te_world_name;;" .. minetest.formspec_escape(worldname) .. "]" ..
"label[2,1;" .. fgettext("Seed") .. "]"..
"field[4.5,1.4;6,0.5;te_seed;;".. current_seed .. "]" ..
@@ -121,10 +138,14 @@ local function create_world_buttonhandler(this, fields)
return true
end
+ worldname = fields.te_world_name
+
if fields["games"] then
+ local gameindex = core.get_textlist_index("games")
+ core.settings:set("menu_last_game", gamemgr.games[gameindex].id)
return true
end
-
+
if fields["world_create_cancel"] then
this:delete()
return true
@@ -135,6 +156,7 @@ end
function create_create_world_dlg(update_worldlistfilter)
+ worldname = ""
local retval = dialog_create("sp_create_world",
create_world_formspec,
create_world_buttonhandler,