Read MWScript variables without case sensitivity

This commit is contained in:
blagish
2026-10-19 12:31:58 +04:00
parent 23b3e0fef8
commit 08e1e7fb74
3 changed files with 23 additions and 2 deletions
+3 -2
View File
@@ -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<double> {
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;
},
@@ -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<ESM::Script>().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<double>(), 7);
EXPECT_EQ(actor.mData.getLocals().mShorts[0], 7);
}
}
}
+1
View File
@@ -24,6 +24,7 @@
-- @type MWScriptFunctions
---
-- Variable names are case-insensitive.
-- @type MWScriptVariables
-- @map <#string, #number>