# HG changeset patch # User Waqas Hussain # Date 1298214712 -18000 # Node ID 4d52812d018dbecc5e0504f82449f5508a9524ed # Parent a1ac8f064dcb5b5dd71416fa4be96b19e847880a util.pluginloader: Remove unused support for custom loaders, to simplify further refactoring. diff -r a1ac8f064dcb -r 4d52812d018d util/pluginloader.lua --- a/util/pluginloader.lua Sun Feb 20 20:06:38 2011 +0500 +++ b/util/pluginloader.lua Sun Feb 20 20:11:52 2011 +0500 @@ -32,28 +32,24 @@ return content, path; end -function load_resource(plugin, resource, loader) +function load_resource(plugin, resource) local path, name = plugin:match("([^/]*)/?(.*)"); if name == "" then if not resource then resource = "mod_"..plugin..".lua"; end - loader = loader or load_file; - local content, err = loader(plugin.."/"..resource); - if not content then content, err = loader(resource); end - -- TODO add support for packed plugins + local content, err = load_file(plugin.."/"..resource); + if not content then content, err = load_file(resource); end return content, err; else if not resource then resource = "mod_"..name..".lua"; end - loader = loader or load_file; - local content, err = loader(plugin.."/"..resource); - if not content then content, err = loader(path.."/"..resource); end - -- TODO add support for packed plugins + local content, err = load_file(plugin.."/"..resource); + if not content then content, err = load_file(path.."/"..resource); end return content, err; end