From 08e1e7fb74e811bb2c23e25ea47dd7d7dcf005e3 Mon Sep 17 00:00:00 2001 From: blagish Date: Fri, 9 Oct 2026 23:31:19 +0400 Subject: [PATCH] Read MWScript variables without case sensitivity --- apps/openmw/mwlua/mwscriptbindings.cpp | 5 +++-- .../mwlua/testmwscriptbindings.cpp | 19 +++++++++++++++++++ files/lua_api/openmw/world.lua | 1 + 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwlua/mwscriptbindings.cpp b/apps/openmw/mwlua/mwscriptbindings.cpp index 8066fb55e2..275638131e 100644 --- a/apps/openmw/mwlua/mwscriptbindings.cpp +++ b/apps/openmw/mwlua/mwscriptbindings.cpp @@ -244,8 +244,9 @@ namespace MWLua = [](MWScriptVariables& s) { return s.mRef.getLocals().getSize(s.mRef.mId); }; mwscriptVars[sol::meta_function::index] = sol::overload( [](MWScriptVariables& s, std::string_view var) -> sol::optional { - if (s.mRef.getLocals().hasVar(s.mRef.mId, var)) - return s.mRef.getLocals().getVarAsDouble(s.mRef.mId, Misc::StringUtils::lowerCase(var)); + const std::string name = Misc::StringUtils::lowerCase(var); + if (s.mRef.getLocals().hasVar(s.mRef.mId, name)) + return s.mRef.getLocals().getVarAsDouble(s.mRef.mId, name); else return sol::nullopt; }, diff --git a/apps/openmw_tests/mwlua/testmwscriptbindings.cpp b/apps/openmw_tests/mwlua/testmwscriptbindings.cpp index b3476a3bbb..54109181a6 100644 --- a/apps/openmw_tests/mwlua/testmwscriptbindings.cpp +++ b/apps/openmw_tests/mwlua/testmwscriptbindings.cpp @@ -240,5 +240,24 @@ namespace MWLua EXPECT_TRUE(actor.mData.getLocals().getScriptId().empty()); } + TEST_F(MWLuaMWScriptBindingsTest, shouldReadMWScriptVariablesRegardlessOfNameCase) + { + auto actor = makeActor(); + const MWWorld::Ptr ptr(&actor); + mWorldModel.registerPtr(ptr); + actor.mData.setLocals(*mStore.get().find(mScriptId)); + sol::state_view lua = mLua.unsafeState(); + lua["actor"] = GObject(ptr); + + const sol::protected_function_result result = lua.safe_script( + "local variables = mwscript.getLocalScript(actor).variables\n" + "variables.Runs = 7\n" + "assert(variables.runs == 7)\n" + "return variables.Runs"); + + ASSERT_TRUE(result.valid()); + EXPECT_EQ(result.get(), 7); + EXPECT_EQ(actor.mData.getLocals().mShorts[0], 7); + } } } diff --git a/files/lua_api/openmw/world.lua b/files/lua_api/openmw/world.lua index 6f0a13bdba..e8a3aa6261 100644 --- a/files/lua_api/openmw/world.lua +++ b/files/lua_api/openmw/world.lua @@ -24,6 +24,7 @@ -- @type MWScriptFunctions --- +-- Variable names are case-insensitive. -- @type MWScriptVariables -- @map <#string, #number>