From 1d32386ada3934dd66bb421009b2801b87292f8e Mon Sep 17 00:00:00 2001 From: Jari van der Kaap Date: Mon, 2 Jan 2023 23:18:24 +0100 Subject: [PATCH] Changed back uiscripting require path for loaded scripts to relative path --- src/client/component/ui_scripting.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/client/component/ui_scripting.cpp b/src/client/component/ui_scripting.cpp index 17986c09..63310f4f 100644 --- a/src/client/component/ui_scripting.cpp +++ b/src/client/component/ui_scripting.cpp @@ -253,13 +253,23 @@ namespace ui_scripting { 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(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)) { globals.load_raw_script = true;