From 6583488fedc77ea2fa205a3d0dd697761866597a Mon Sep 17 00:00:00 2001 From: Xeno333 Date: Sun, 15 Jun 2025 00:50:31 -0500 Subject: [PATCH] improve name of var --- builtin/mainmenu/dlg_create_world.lua | 6 +++--- src/script/lua_api/l_mainmenu.cpp | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua index 8905f731d..a539b1b2f 100644 --- a/builtin/mainmenu/dlg_create_world.lua +++ b/builtin/mainmenu/dlg_create_world.lua @@ -412,7 +412,7 @@ local function create_world_buttonhandler(this, fields) this.data.seed = fields["te_seed"] or "" this.data.mg = fields["dd_mapgen"] local mapgen_internal = this.data.mg - local mapgen = nil + local lua_mapgen = nil -- This is used to make sure that the internal mapgens are never overwritten by an ill-playing mapgen local internal_mapgens = core.get_mapgen_names() @@ -428,7 +428,7 @@ local function create_world_buttonhandler(this, fields) for name, v in pairs(lua_mapgens) do if v.title == this.data.mg or (v.title == nil and name == this.data.mg) then mapgen_internal = "singlenode" - mapgen = name + lua_mapgen = name break end end @@ -438,7 +438,7 @@ local function create_world_buttonhandler(this, fields) local settings = { fixed_map_seed = this.data.seed, mg_name = mapgen_internal, - lua_mapgen = mapgen, + lua_mapgen = lua_mapgen, mg_flags = table_to_flags(this.data.flags.main), mgv5_spflags = table_to_flags(this.data.flags.v5), mgv6_spflags = table_to_flags(this.data.flags.v6), diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp index e4eae1bcf..d38573047 100644 --- a/src/script/lua_api/l_mainmenu.cpp +++ b/src/script/lua_api/l_mainmenu.cpp @@ -593,10 +593,7 @@ int ModApiMainMenu::l_create_world(lua_State *L) // Create world if it doesn't exist try { - std::string lua_mapgen = ""; - if (use_settings.find("lua_mapgen") != use_settings.end()) - lua_mapgen = use_settings["lua_mapgen"]; - loadGameConfAndInitWorld(path, name, *game_it, true, lua_mapgen); + loadGameConfAndInitWorld(path, name, *game_it, true, g_settings->get("lua_mapgen")); lua_pushnil(L); } catch (const BaseException &e) { auto err = std::string("Failed to initialize world: ") + e.what();