aboutsummaryrefslogtreecommitdiff
path: root/builtin/mainmenu
diff options
context:
space:
mode:
authorSmallJoker <SmallJoker@users.noreply.github.com>2017-05-19 07:45:47 +0200
committerLoïc Blot <nerzhul@users.noreply.github.com>2017-05-19 07:45:47 +0200
commit674400523e10624ae8320b0d18a05dbfd6dcac42 (patch)
tree952662707e04d276ee8b68dc30c81f29c7519d4c /builtin/mainmenu
parente25a38e3fbb156ae2bc72cc66aef014ae3963407 (diff)
downloadminetest-674400523e10624ae8320b0d18a05dbfd6dcac42.tar.gz
minetest-674400523e10624ae8320b0d18a05dbfd6dcac42.tar.bz2
minetest-674400523e10624ae8320b0d18a05dbfd6dcac42.zip
Mainmenu: Fix issues while trying to enable all mods (#5770)
Diffstat (limited to 'builtin/mainmenu')
-rw-r--r--builtin/mainmenu/dlg_config_world.lua24
-rw-r--r--builtin/mainmenu/modmgr.lua4
2 files changed, 16 insertions, 12 deletions
diff --git a/builtin/mainmenu/dlg_config_world.lua b/builtin/mainmenu/dlg_config_world.lua
index 3e5ba16eb..fcedadea8 100644
--- a/builtin/mainmenu/dlg_config_world.lua
+++ b/builtin/mainmenu/dlg_config_world.lua
@@ -49,7 +49,7 @@ local function get_formspec(data)
"button[3.25,7;2.5,0.5;btn_config_world_save;" .. fgettext("Save") .. "]" ..
"button[5.75,7;2.5,0.5;btn_config_world_cancel;" .. fgettext("Cancel") .. "]"
- if mod and mod.name ~= "" and mod.typ ~= "game_mod" then
+ if mod and mod.name ~= "" and not mod.is_game_content then
if mod.is_modpack then
local rawlist = data.list:get_raw_list()
@@ -97,7 +97,7 @@ end
local function enable_mod(this, toset)
local mod = this.data.list:get_list()[this.data.selected_mod]
- if mod.typ == "game_mod" then
+ if mod.is_game_content then
-- game mods can't be enabled or disabled
elseif not mod.is_modpack then
if toset == nil then
@@ -162,7 +162,7 @@ local function handle_buttons(this, fields)
local i,mod
for i,mod in ipairs(rawlist) do
if not mod.is_modpack and
- mod.typ ~= "game_mod" then
+ not mod.is_game_content then
if modname_valid(mod.name) then
worldfile:set("load_mod_"..mod.name, tostring(mod.enabled))
else
@@ -198,7 +198,8 @@ local function handle_buttons(this, fields)
local list = this.data.list:get_raw_list()
for i = 1, #list do
- if list[i].typ ~= "game_mod" and not list[i].is_modpack then
+ if not list[i].is_game_content
+ and not list[i].is_modpack then
list[i].enabled = true
end
end
@@ -210,7 +211,8 @@ local function handle_buttons(this, fields)
local list = this.data.list:get_raw_list()
for i = 1, #list do
- if list[i].typ ~= "game_mod" and not list[i].is_modpack then
+ if not list[i].is_game_content
+ and not list[i].is_modpack then
list[i].enabled = false
end
end
@@ -252,16 +254,16 @@ function create_configure_world_dlg(worldidx)
return true
end
end,
- function(element,criteria)
+ function(element, criteria)
if criteria.hide_game and
- element.typ == "game_mod" then
- return false
+ element.is_game_content then
+ return false
end
if criteria.hide_modpackcontents and
- element.modpack ~= nil then
- return false
- end
+ element.modpack ~= nil then
+ return false
+ end
return true
end, --filter
{ worldpath= dlg.data.worldspec.path,
diff --git a/builtin/mainmenu/modmgr.lua b/builtin/mainmenu/modmgr.lua
index 14d29272e..dee048982 100644
--- a/builtin/mainmenu/modmgr.lua
+++ b/builtin/mainmenu/modmgr.lua
@@ -252,7 +252,7 @@ function modmgr.render_modlist(render_list)
break
end
end
- elseif v.typ == "game_mod" or v.typ == "game" then
+ elseif v.is_game_content then
color = mt_color_blue
elseif v.enabled then
color = mt_color_green
@@ -417,12 +417,14 @@ function modmgr.preparemodlist(data)
-- Add title
retval[#retval + 1] = {
typ = "game",
+ is_game_content = true,
name = fgettext("Subgame Mods")
}
end
for i=1,#game_mods,1 do
game_mods[i].typ = "game_mod"
+ game_mods[i].is_game_content = true
retval[#retval + 1] = game_mods[i]
end