Skip to content
Snippets Groups Projects
Commit 71da4a36 authored by dg's avatar dg
Browse files

Fixed wrong order of loading chained superloads of addons

git-svn-id: http://svn.net-core.org/repos/t-engine4@6382 51575b47-30f0-44d4-a5cc-537603b46e54
parent 420fdcdc
No related branches found
No related tags found
No related merge requests found
game/engines/default/data/gfx/te4-icon.png

6.81 KiB | W: | H:

game/engines/default/data/gfx/te4-icon.png

10.6 KiB | W: | H:

game/engines/default/data/gfx/te4-icon.png
game/engines/default/data/gfx/te4-icon.png
game/engines/default/data/gfx/te4-icon.png
game/engines/default/data/gfx/te4-icon.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -344,6 +344,7 @@ function _M:loadAddons(mod, saveuse)
end
mod.addons = {}
_G.__addons_superload_order = {}
for i, add in ipairs(adds) do
add.version_name = ("%s-%s-%d.%d.%d"):format(mod.short_name, add.short_name, add.version[1], add.version[2], add.version[3])
......@@ -360,7 +361,10 @@ function _M:loadAddons(mod, saveuse)
end
if add.data then fs.mount(base.."/data", "/data-"..add.short_name, true) print(" * with data") end
if add.superload then fs.mount(base.."/superload", "/mod/addons/"..add.short_name.."/superload", true) print(" * with superload") end
if add.superload then
fs.mount(base.."/superload", "/mod/addons/"..add.short_name.."/superload", true) print(" * with superload")
table.insert(_G.__addons_superload_order, add.short_name)
end
if add.overload then fs.mount(base.."/overload", "/", false) print(" * with overload") end
if add.hooks then
fs.mount(base.."/hooks", "/hooks/"..add.short_name, true)
......
......@@ -133,6 +133,7 @@ load(...)
fs.umount(homepath)
__addons_superload_order = {}
local te4_loader = function(name)
local bname = name
......@@ -140,7 +141,8 @@ local te4_loader = function(name)
local prev = loadfile("/"..bname:gsub("%.", "/")..".lua")
name = name:gsub("%.", "/")
for i, addon in ipairs(fs.list("/mod/addons/")) do
for i = 1, #__addons_superload_order do
local addon = __addons_superload_order[i]
local fn = "/mod/addons/"..addon.."/superload/"..name..".lua"
if fs.exists(fn) then
local f = loadfile(fn)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment