Commit e2f2f953 authored by POLYMER's avatar POLYMER

fix

parent b055534e
...@@ -73,11 +73,12 @@ if not require and Duel.LoadScript then ...@@ -73,11 +73,12 @@ if not require and Duel.LoadScript then
function require(str) function require(str)
require_list=require_list or {} require_list=require_list or {}
local name=str local name=str
for word in string.gmatch(str,"%w+") do for word in string.gmatch(str,"[^/]+") do
name=word name=word
end end
if not string.find(name,"%.") then name=name..".lua" end
if not require_list[str] then if not require_list[str] then
require_list[str]=Duel.LoadScript(name..".lua") require_list[str]=Duel.LoadScript(name)
end end
return require_list[str] return require_list[str]
end end
...@@ -101,7 +102,7 @@ if not dofile and Duel.LoadScript then ...@@ -101,7 +102,7 @@ if not dofile and Duel.LoadScript then
function dofile(str) function dofile(str)
require_list=require_list or {} require_list=require_list or {}
local name=str local name=str
for word in string.gmatch(str,"%w+") do for word in string.gmatch(str,"[^/]+") do
name=word name=word
end end
if not require_list[str] then if not require_list[str] then
...@@ -112,7 +113,7 @@ if not dofile and Duel.LoadScript then ...@@ -112,7 +113,7 @@ if not dofile and Duel.LoadScript then
function loadfile(str) function loadfile(str)
require_list=require_list or {} require_list=require_list or {}
local name=str local name=str
for word in string.gmatch(str,"%w+") do for word in string.gmatch(str,"[^/]+") do
name=word name=word
end end
return function() return function()
......
...@@ -81,11 +81,12 @@ function Auxiliary.PreloadUds() ...@@ -81,11 +81,12 @@ function Auxiliary.PreloadUds()
function require(str) function require(str)
require_list=require_list or {} require_list=require_list or {}
local name=str local name=str
for word in string.gmatch(str,"%w+") do for word in string.gmatch(str,"[^/]+") do
name=word name=word
end end
if not string.find(name,"%.") then name=name..".lua" end
if not require_list[str] then if not require_list[str] then
require_list[str]=Duel.LoadScript(name..".lua") require_list[str]=Duel.LoadScript(name)
end end
return require_list[str] return require_list[str]
end end
...@@ -109,7 +110,7 @@ function Auxiliary.PreloadUds() ...@@ -109,7 +110,7 @@ function Auxiliary.PreloadUds()
function dofile(str) function dofile(str)
require_list=require_list or {} require_list=require_list or {}
local name=str local name=str
for word in string.gmatch(str,"[%w+%.+]") do for word in string.gmatch(str,"[^/]+") do
name=word name=word
end end
if not require_list[str] then if not require_list[str] then
...@@ -120,7 +121,7 @@ function Auxiliary.PreloadUds() ...@@ -120,7 +121,7 @@ function Auxiliary.PreloadUds()
function loadfile(str) function loadfile(str)
require_list=require_list or {} require_list=require_list or {}
local name=str local name=str
for word in string.gmatch(str,"[%w+%.+]") do for word in string.gmatch(str,"[^/]+") do
name=word name=word
end end
return function() return function()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment