1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 13:41:32 +00:00

Merge branch 'more_move' into 'master'

Move action argument

See merge request OpenMW/openmw!3844
This commit is contained in:
psi29a 2024-02-07 09:18:34 +00:00
commit 557e83d502

View file

@ -241,7 +241,7 @@ namespace MWLua
for (unsigned i = 0; i < newStack.size(); ++i) for (unsigned i = 0; i < newStack.size(); ++i)
newStack[i] = nameToMode.at(LuaUtil::cast<std::string_view>(modes[i + 1])); newStack[i] = nameToMode.at(LuaUtil::cast<std::string_view>(modes[i + 1]));
luaManager->addAction( luaManager->addAction(
[windowManager, newStack = std::move(newStack), arg]() { [windowManager, newStack = std::move(newStack), arg = std::move(arg)]() {
MWWorld::Ptr ptr; MWWorld::Ptr ptr;
if (arg.has_value()) if (arg.has_value())
ptr = arg->ptr(); ptr = arg->ptr();