0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wesnoth.require: Automatically check current directory for packages

Browse source
This commit is contained in:
Celtic Minstrel 2017-05-07 18:53:56 -04:00
parent f0d023164e
commit cbba6b3929
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
data/lua/package.lua
View file

@ -20,23 +20,23 @@ local function resolve_package(pkg_name)
end
if wesnoth.have_file(pkg_name) then return pkg_name end
if pkg_name:sub(-4) ~= ".lua" then
if wesnoth.have_file(pkg_name .. ".lua") then
return pkg_name .. ".lua"
end
if pkg_name:sub(1, 4) ~= "lua/" then
if wesnoth.have_file("lua/" .. pkg_name .. ".lua") then
return "lua/" .. pkg_name .. ".lua"
end
end
local test = resolve_package(pkg_name .. ".lua")
if test then return test end
end
if pkg_name:sub(1, 4) ~= "lua/" then
if wesnoth.have_file("lua/" .. pkg_name) then
return "lua/" .. pkg_name
end
end
if pkg_name:sub(1, 2) ~= "./" then
if wesnoth.have_file("./" .. pkg_name) then
return "./" .. pkg_name
end
end
return nil
end
-- TODO: Currently if you require a file by different (relative) paths, each will be a different copy.
function wesnoth.require(pkg_name)
-- First, check if the package is already loaded
local loaded_name = resolve_package(pkg_name)