Rim/t7x
Rim/t7x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Changed back uiscripting require path for loaded scripts to relative path

Browse Source
This commit is contained in:
Jari van der Kaap 2023-01-02 23:18:24 +01:00
parent 27d081700a
commit 1d32386ada
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/component/ui_scripting.cpp
View File

@ -253,13 +253,23 @@ namespace ui_scripting
{ {
game::XAssetHeader header{ .luaFile = nullptr }; game::XAssetHeader header{ .luaFile = nullptr };
if (!is_local_script(filename)) if (!is_loaded_script(globals.in_require_script) && !is_local_script(filename))
{ {
return lua_cod_getrawfile_hook.invoke<game::XAssetHeader>(filename); return lua_cod_getrawfile_hook.invoke<game::XAssetHeader>(filename);
} }
std::string target_script = globals.local_scripts[filename]; const std::string name_ = filename;
std::string target_script;
if (is_loaded_script(globals.in_require_script))
{
const auto folder = globals.in_require_script.substr(0, globals.in_require_script.find_last_of("/\\"));
target_script = folder + "/" + name_ + ".lua";
}
else
{
target_script = globals.local_scripts[name_];
}
if (utils::io::file_exists(target_script)) if (utils::io::file_exists(target_script))
{ {
globals.load_raw_script = true; globals.load_raw_script = true;