Merge branch 'main' into dev

2025-10-06 19:31:58 +03:00
parent d63d0e59ca 4fa430b6ba
commit 4a15abd806
4 changed files with 22 additions and 6 deletions
@@ -558,7 +558,7 @@ local internal_locked = false
 --     Example `base:scripts/tests.lua`
 --
 -- nocache - ignore cached script, load anyway
-function __load_script(path, nocache)
+local function __load_script(path, nocache, env)
    local packname, filename = parse_path(path)

    if internal_locked and (packname == "res" or packname == "core") 
@@ -578,6 +578,9 @@ function __load_script(path, nocache)
    if script == nil then
        error(err)
    end
+    if env then
+        script = setfenv(script, env)
+    end
    local result = script()
    if not nocache then
        __cached_scripts[path] = script
@@ -593,10 +596,11 @@ end
 function require(path)
    if not string.find(path, ':') then
        local prefix, _ = parse_path(_debug_getinfo(2).source)
-        return require(prefix..':'..path)
+        return require(prefix .. ':' .. path)
    end
    local prefix, file = parse_path(path)
-    return __load_script(prefix..":modules/"..file..".lua")
+    local env = __vc__pack_envs[prefix]
+    return __load_script(prefix .. ":modules/" .. file .. ".lua", nil, env)
 end

 function __scripts_cleanup()