From 71b2570f0919d3bb5575c9ec694ecd004222fcea Mon Sep 17 00:00:00 2001 From: Andrew Ward Date: Wed, 28 Mar 2018 22:14:16 +0100 Subject: Load dependencies and description from mod.conf --- builtin/mainmenu/modmgr.lua | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) (limited to 'builtin/mainmenu/modmgr.lua') diff --git a/builtin/mainmenu/modmgr.lua b/builtin/mainmenu/modmgr.lua index dee048982..185bcd639 100644 --- a/builtin/mainmenu/modmgr.lua +++ b/builtin/mainmenu/modmgr.lua @@ -271,34 +271,13 @@ function modmgr.render_modlist(render_list) end -------------------------------------------------------------------------------- -function modmgr.get_dependencies(modfolder) - local toadd_hard = "" - local toadd_soft = "" - if modfolder ~= nil then - local filename = modfolder .. - DIR_DELIM .. "depends.txt" - - local hard_dependencies = {} - local soft_dependencies = {} - local dependencyfile = io.open(filename,"r") - if dependencyfile then - local dependency = dependencyfile:read("*l") - while dependency do - dependency = dependency:gsub("\r", "") - if string.sub(dependency, -1, -1) == "?" then - table.insert(soft_dependencies, string.sub(dependency, 1, -2)) - else - table.insert(hard_dependencies, dependency) - end - dependency = dependencyfile:read() - end - dependencyfile:close() - end - toadd_hard = table.concat(hard_dependencies, ",") - toadd_soft = table.concat(soft_dependencies, ",") +function modmgr.get_dependencies(path) + if path == nil then + return "", "" end - return toadd_hard, toadd_soft + local info = core.get_mod_info(path) + return table.concat(info.depends, ","), table.concat(info.optional_depends, ",") end -------------------------------------------------------------------------------- -- cgit v1.2.3