diff --git a/res/modules/internal/extensions/table.lua b/res/modules/internal/extensions/table.lua index b7c645568..d2d665755 100644 --- a/res/modules/internal/extensions/table.lua +++ b/res/modules/internal/extensions/table.lua @@ -57,7 +57,7 @@ function table.merge(t1, t2) return t1 end -function table.merge_replace(t1, t2) +function table.extend(t1, t2) for i, v in pairs(t2) do if type(i) == "number" then t1[#t1 + 1] = v diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua index 904ca6081..2868dd634 100644 --- a/res/scripts/stdmin.lua +++ b/res/scripts/stdmin.lua @@ -302,7 +302,9 @@ require "core:internal/extensions/file" require "core:internal/extensions/table" require "core:internal/extensions/string" -vc.get_project_args = table.copy(_vc_project_args) +vc.get_project_arg = function (name) + return _vc_project_args[name] +end local bytearray = require "core:internal/bytearray" Bytearray = bytearray.FFIBytearray diff --git a/src/logic/scripting/lua/libs/libgui.cpp b/src/logic/scripting/lua/libs/libgui.cpp index 42aa0facf..cdd3dad28 100644 --- a/src/logic/scripting/lua/libs/libgui.cpp +++ b/src/logic/scripting/lua/libs/libgui.cpp @@ -1126,7 +1126,7 @@ static int l_gui_load_document(lua::State* L) { auto env = scripting::create_doc_environment(parentEnv, alias); // namespace extension if (lua::istable(L, 4)) { - if (lua::get_from(L, "table", "merge_replace")) { + if (lua::get_from(L, "table", "extend")) { lua::pushenv(L, *env); lua::pushvalue(L, 4); lua::call(L, 2, 0);