stdlib.lua load_script fix
This commit is contained in:
parent
f88623ddd6
commit
1f3d1e2640
@ -37,7 +37,7 @@ function load_script(path, nocache)
|
|||||||
if not nocache and __cached_scripts[fullpath] ~= nil then
|
if not nocache and __cached_scripts[fullpath] ~= nil then
|
||||||
return __cached_results[fullpath]
|
return __cached_results[fullpath]
|
||||||
end
|
end
|
||||||
if not file.isfile(fullpath) then
|
if not file.isfile(path) then
|
||||||
error("script '"..filename.."' not found in '"..packname.."'")
|
error("script '"..filename.."' not found in '"..packname.."'")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -94,8 +94,6 @@ void EnginePaths::setContentPacks(std::vector<ContentPack>* contentPacks) {
|
|||||||
this->contentPacks = contentPacks;
|
this->contentPacks = contentPacks;
|
||||||
}
|
}
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
static fs::path toCanonic(fs::path path) {
|
static fs::path toCanonic(fs::path path) {
|
||||||
std::stack<std::string> parts;
|
std::stack<std::string> parts;
|
||||||
path = path.lexically_normal();
|
path = path.lexically_normal();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user