diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/mainmenu/common.lua | 31 | ||||
| -rw-r--r-- | builtin/mainmenu/tab_server.lua | 49 | ||||
| -rw-r--r-- | builtin/mainmenu/tab_singleplayer.lua | 47 |
3 files changed, 45 insertions, 82 deletions
diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua index 6126c61a4..bcb075f99 100644 --- a/builtin/mainmenu/common.lua +++ b/builtin/mainmenu/common.lua @@ -300,3 +300,34 @@ function is_server_protocol_compat_or_error(proto_min, proto_max) return true end +-------------------------------------------------------------------------------- +function menu_worldmt(selected, setting, value) + local world = menudata.worldlist:get_list()[selected] + if world then + local filename = world.path .. DIR_DELIM .. "world.mt" + local world_conf = Settings(filename) + + if value then + if not world_conf:write() then + core.log("error", "Failed to write world config file") + end + return world_conf:set(setting, value) + else + return world_conf:get(setting) + end + else + return nil + end +end + +function menu_worldmt_legacy() + local modes = {"creative_mode", "enable_damage"} + for _, mode in pairs(modes) do + local mode = menu_worldmt(selected, ""..mode.."") + if mode then + core.setting_set(""..mode.."", mode) + else + menu_worldmt(selected, ""..mode.."", core.setting_get(""..mode.."")) + end + end +end diff --git a/builtin/mainmenu/tab_server.lua b/builtin/mainmenu/tab_server.lua index d78af768f..2362d32a1 100644 --- a/builtin/mainmenu/tab_server.lua +++ b/builtin/mainmenu/tab_server.lua @@ -67,32 +67,9 @@ local function main_button_handler(this, fields, name, tabdata) if fields["srv_worlds"] ~= nil then local event = core.explode_textlist_event(fields["srv_worlds"]) - local selected = core.get_textlist_index("srv_worlds") - if selected ~= nil then - local filename = menudata.worldlist:get_list()[selected].path - local worldconfig = modmgr.get_worldconfig(filename) - filename = filename .. DIR_DELIM .. "world.mt" - - if worldconfig.creative_mode ~= nil then - core.setting_set("creative_mode", worldconfig.creative_mode) - else - local worldfile = Settings(filename) - worldfile:set("creative_mode", core.setting_get("creative_mode")) - if not worldfile:write() then - core.log("error", "Failed to write world config file") - end - end - if worldconfig.enable_damage ~= nil then - core.setting_set("enable_damage", worldconfig.enable_damage) - else - local worldfile = Settings(filename) - worldfile:set("enable_damage", core.setting_get("enable_damage")) - if not worldfile:write() then - core.log("error", "Failed to write world config file") - end - end - end + + menu_worldmt_legacy() if event.type == "DCL" then world_doubleclick = true @@ -111,28 +88,16 @@ local function main_button_handler(this, fields, name, tabdata) if fields["cb_creative_mode"] then core.setting_set("creative_mode", fields["cb_creative_mode"]) local selected = core.get_textlist_index("srv_worlds") - local filename = menudata.worldlist:get_list()[selected].path .. - DIR_DELIM .. "world.mt" + menu_worldmt(selected, "creative_mode", fields["cb_creative_mode"]) - local worldfile = Settings(filename) - worldfile:set("creative_mode", fields["cb_creative_mode"]) - if not worldfile:write() then - core.log("error", "Failed to write world config file") - end return true end if fields["cb_enable_damage"] then core.setting_set("enable_damage", fields["cb_enable_damage"]) local selected = core.get_textlist_index("srv_worlds") - local filename = menudata.worldlist:get_list()[selected].path .. - DIR_DELIM .. "world.mt" + menu_worldmt(selected, "enable_damage", fields["cb_enable_damage"]) - local worldfile = Settings(filename) - worldfile:set("enable_damage", fields["cb_enable_damage"]) - if not worldfile:write() then - core.log("error", "Failed to write world config file") - end return true end @@ -159,9 +124,11 @@ local function main_button_handler(this, fields, name, tabdata) --update last game local world = menudata.worldlist:get_raw_element(gamedata.selected_world) + if world then + local game, index = gamemgr.find_by_gameid(world.gameid) + core.setting_set("menu_last_game", game.id) + end - local game,index = gamemgr.find_by_gameid(world.gameid) - core.setting_set("menu_last_game",game.id) core.start() return true end diff --git a/builtin/mainmenu/tab_singleplayer.lua b/builtin/mainmenu/tab_singleplayer.lua index c2b850e44..916b0c188 100644 --- a/builtin/mainmenu/tab_singleplayer.lua +++ b/builtin/mainmenu/tab_singleplayer.lua @@ -23,9 +23,9 @@ local function current_game() end local function singleplayer_refresh_gamebar() - + local old_bar = ui.find_by_name("game_button_bar") - + if old_bar ~= nil then old_bar:delete() end @@ -76,7 +76,7 @@ end local function get_formspec(tabview, name, tabdata) local retval = "" - + local index = filterlist.get_current_index(menudata.worldlist, tonumber(core.setting_get("mainmenu_last_selected_world")) ) @@ -105,32 +105,9 @@ local function main_button_handler(this, fields, name, tabdata) if fields["sp_worlds"] ~= nil then local event = core.explode_textlist_event(fields["sp_worlds"]) - local selected = core.get_textlist_index("sp_worlds") - if selected ~= nil then - local filename = menudata.worldlist:get_list()[selected].path - local worldconfig = modmgr.get_worldconfig(filename) - filename = filename .. DIR_DELIM .. "world.mt" - if worldconfig.creative_mode ~= nil then - core.setting_set("creative_mode", worldconfig.creative_mode) - else - local worldfile = Settings(filename) - worldfile:set("creative_mode", core.setting_get("creative_mode")) - if not worldfile:write() then - core.log("error", "Failed to write world config file") - end - end - if worldconfig.enable_damage ~= nil then - core.setting_set("enable_damage", worldconfig.enable_damage) - else - local worldfile = Settings(filename) - worldfile:set("enable_damage", core.setting_get("enable_damage")) - if not worldfile:write() then - core.log("error", "Failed to write world config file") - end - end - end + menu_worldmt_legacy() if event.type == "DCL" then world_doubleclick = true @@ -150,28 +127,16 @@ local function main_button_handler(this, fields, name, tabdata) if fields["cb_creative_mode"] then core.setting_set("creative_mode", fields["cb_creative_mode"]) local selected = core.get_textlist_index("sp_worlds") - local filename = menudata.worldlist:get_list()[selected].path .. - DIR_DELIM .. "world.mt" + menu_worldmt(selected, "creative_mode", fields["cb_creative_mode"]) - local worldfile = Settings(filename) - worldfile:set("creative_mode", fields["cb_creative_mode"]) - if not worldfile:write() then - core.log("error", "Failed to write world config file") - end return true end if fields["cb_enable_damage"] then core.setting_set("enable_damage", fields["cb_enable_damage"]) local selected = core.get_textlist_index("sp_worlds") - local filename = menudata.worldlist:get_list()[selected].path .. - DIR_DELIM .. "world.mt" + menu_worldmt(selected, "enable_damage", fields["cb_enable_damage"]) - local worldfile = Settings(filename) - worldfile:set("enable_damage", fields["cb_enable_damage"]) - if not worldfile:write() then - core.log("error", "Failed to write world config file") - end return true end |