From e248ba293a809ab32a47deb3111c21ea7b9e0899 Mon Sep 17 00:00:00 2001 From: uramer Date: Fri, 1 Mar 2024 22:27:47 +0100 Subject: [PATCH 1/2] Use sol helpers for metatable keys --- components/lua/luastate.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp index dc626b2a1f..2f5800c521 100644 --- a/components/lua/luastate.cpp +++ b/components/lua/luastate.cpp @@ -316,12 +316,13 @@ namespace LuaUtil sol::table meta(lua, sol::create); meta["t"] = table; if (strictIndex) - meta["__index"] = lua["createStrictIndexFn"](table); + meta[sol::meta_method::index] = lua["createStrictIndexFn"](table); else - meta["__index"] = table; - meta["__pairs"] = lua["pairsForReadOnly"]; - meta["__ipairs"] = lua["ipairsForReadOnly"]; - meta["__len"] = lua["lenForReadOnly"]; + meta[sol::meta_method::index] = table; + meta[sol::meta_method::pairs] = lua["pairsForReadOnly"]; + meta[sol::meta_method::ipairs] = lua["ipairsForReadOnly"]; + meta[sol::meta_method::length] = lua["lenForReadOnly"]; + meta[sol::meta_method::type] = "ReadOnlyTable"; lua_newuserdata(luaState, 0); sol::stack::push(luaState, meta); From ad1c2a0e9f1667a4d689758d48e8b50b04661af7 Mon Sep 17 00:00:00 2001 From: uramer Date: Sat, 18 May 2024 12:30:21 +0200 Subject: [PATCH 2/2] Fix table-valued settings --- files/data/scripts/omw/settings/menu.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/files/data/scripts/omw/settings/menu.lua b/files/data/scripts/omw/settings/menu.lua index 8ae227e0f1..3cb56f40e4 100644 --- a/files/data/scripts/omw/settings/menu.lua +++ b/files/data/scripts/omw/settings/menu.lua @@ -157,7 +157,7 @@ local function renderGroup(group, global) sortedSettings[setting.order] = setting end for _, setting in ipairs(sortedSettings) do - table.insert(settingLayouts, renderSetting(group, setting, valueSection:get(setting.key), global)) + table.insert(settingLayouts, renderSetting(group, setting, valueSection:getCopy(setting.key), global)) end local settingsContent = ui.content(interlaceSeparator(settingLayouts, spacedLines(1))) @@ -288,7 +288,7 @@ local function renderPage(page, options) table.sort(sortedGroups, pageGroupComparator) local groupLayouts = {} for _, pageGroup in ipairs(sortedGroups) do - local group = common.getSection(pageGroup.global, common.groupSectionKey):get(pageGroup.key) + local group = common.getSection(pageGroup.global, common.groupSectionKey):getCopy(pageGroup.key) if not group then error(string.format('%s group "%s" was not found', pageGroup.global and 'Global' or 'Player', pageGroup.key)) end @@ -360,7 +360,7 @@ end local function onSettingChanged(global) return async:callback(function(groupKey, settingKey) - local group = common.getSection(global, common.groupSectionKey):get(groupKey) + local group = common.getSection(global, common.groupSectionKey):getCopy(groupKey) if not group or not pageOptions[group.page] then return end local groupElement = groupElements[group.page][group.key] @@ -375,7 +375,7 @@ local function onSettingChanged(global) return end - local value = common.getSection(global, group.key):get(settingKey) + local value = common.getSection(global, group.key):getCopy(settingKey) local settingsContent = groupElement.layout.content.settings.content auxUi.deepDestroy(settingsContent[settingKey]) -- support setting renderers which return UI elements settingsContent[settingKey] = renderSetting(group, group.settings[settingKey], value, global) @@ -404,7 +404,7 @@ local function onGroupRegistered(global, key) local group = common.getSection(global, common.groupSectionKey):get(group.key) if not group or not pageOptions[group.page] then return end - local value = common.getSection(global, group.key):get(settingKey) + local value = common.getSection(global, group.key):getCopy(settingKey) local element = groupElements[group.page][group.key] local settingsContent = element.layout.content.settings.content