diff options
| author | rubenwardy <rw@rubenwardy.com> | 2022-05-21 16:23:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-21 16:23:30 +0100 |
| commit | 4e9e230e34912d08ec0f0fc01d14ef80654c7cac (patch) | |
| tree | ae06c4fc9971808dd0a87d07aba702d8561b05ef /builtin | |
| parent | dc45b85a543b4c8ad72f69a554ecfe7f0a60c533 (diff) | |
| download | hax-minetest-server-4e9e230e34912d08ec0f0fc01d14ef80654c7cac.tar.gz hax-minetest-server-4e9e230e34912d08ec0f0fc01d14ef80654c7cac.zip | |
Deprecate game.conf name, use title instead (#12030)
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/mainmenu/dlg_contentstore.lua | 16 | ||||
| -rw-r--r-- | builtin/mainmenu/pkgmgr.lua | 8 | ||||
| -rw-r--r-- | builtin/mainmenu/tab_local.lua | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/builtin/mainmenu/dlg_contentstore.lua b/builtin/mainmenu/dlg_contentstore.lua index 276a7b096..16ab1c3a7 100644 --- a/builtin/mainmenu/dlg_contentstore.lua +++ b/builtin/mainmenu/dlg_contentstore.lua @@ -151,11 +151,9 @@ local function start_install(package, reason) if conf_path then local conf = Settings(conf_path) - if name_is_title then - conf:set("name", package.title) - else - conf:set("title", package.title) - conf:set("name", package.name) + conf:set("title", package.title) + if not name_is_title then + conf:set("name", package.name) end if not conf:get("description") then conf:set("description", package.short_description) @@ -360,7 +358,7 @@ function install_dialog.get_formspec() selected_game_idx = i end - games[i] = core.formspec_escape(games[i].name) + games[i] = core.formspec_escape(games[i].title) end local selected_game = pkgmgr.games[selected_game_idx] @@ -410,7 +408,7 @@ function install_dialog.get_formspec() "container[0.375,0.70]", "label[0,0.25;", fgettext("Base Game:"), "]", - "dropdown[2,0;4.25,0.5;gameid;", table.concat(games, ","), ";", selected_game_idx, "]", + "dropdown[2,0;4.25,0.5;selected_game;", table.concat(games, ","), ";", selected_game_idx, "]", "label[0,0.8;", fgettext("Dependencies:"), "]", @@ -461,9 +459,9 @@ function install_dialog.handle_submit(this, fields) return true end - if fields.gameid then + if fields.selected_game then for _, game in pairs(pkgmgr.games) do - if game.name == fields.gameid then + if game.title == fields.selected_game then core.settings:set("menu_last_game", game.id) break end diff --git a/builtin/mainmenu/pkgmgr.lua b/builtin/mainmenu/pkgmgr.lua index 334fcf5f8..b2f3243c4 100644 --- a/builtin/mainmenu/pkgmgr.lua +++ b/builtin/mainmenu/pkgmgr.lua @@ -646,6 +646,8 @@ function pkgmgr.install_dir(type, path, basename, targetpath) else targetpath = core.get_gamepath() .. DIR_DELIM .. basename end + else + error("basefolder didn't return a recognised type, this shouldn't happen") end -- Copy it @@ -692,7 +694,7 @@ function pkgmgr.preparemodlist(data) retval[#retval + 1] = { type = "game", is_game_content = true, - name = fgettext("$1 mods", gamespec.name), + name = fgettext("$1 mods", gamespec.title), path = gamespec.path } end @@ -873,10 +875,10 @@ end function pkgmgr.gamelist() local retval = "" if #pkgmgr.games > 0 then - retval = retval .. core.formspec_escape(pkgmgr.games[1].name) + retval = retval .. core.formspec_escape(pkgmgr.games[1].title) for i=2,#pkgmgr.games,1 do - retval = retval .. "," .. core.formspec_escape(pkgmgr.games[i].name) + retval = retval .. "," .. core.formspec_escape(pkgmgr.games[i].title) end end return retval diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua index e77c6f04d..049d16507 100644 --- a/builtin/mainmenu/tab_local.lua +++ b/builtin/mainmenu/tab_local.lua @@ -88,7 +88,7 @@ if enable_gamebar then local image = nil local text = nil - local tooltip = core.formspec_escape(game.name) + local tooltip = core.formspec_escape(game.title) if (game.menuicon_path or "") ~= "" then image = core.formspec_escape(game.menuicon_path) |