Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-08 03:28:15 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

[Lua] Accept GameObject as destination in obj:moveInto.

Browse source
This commit is contained in:
Petr Mikheev 2023-08-06 17:29:09 +02:00
parent 84e71f4977
commit 1a53e9db5d
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwlua/objectbindings.cpp
View file

@ -409,11 +409,18 @@ namespace MWLua
return GObject(splitted);
};
objectT["moveInto"] = [removeFn, context](const GObject& object, const Inventory<GObject>& inventory) {
objectT["moveInto"] = [removeFn, context](const GObject& object, const sol::object& dest) {
const MWWorld::Ptr& ptr = object.ptr();
int count = ptr.getRefData().getCount();
MWWorld::Ptr destPtr;
if (dest.is<GObject>())
destPtr = dest.as<GObject>().ptr();
else
destPtr = LuaUtil::cast<Inventory<GObject>>(dest).mObj.ptr();
destPtr.getContainerStore(); // raises an error if there is no container store
std::optional<DelayedRemovalFn> delayedRemovalFn = removeFn(ptr, count);
context.mLuaManager->addAction([item = object, count, cont = inventory.mObj, delayedRemovalFn] {
context.mLuaManager->addAction([item = object, count, cont = GObject(destPtr), delayedRemovalFn] {
const MWWorld::Ptr& oldPtr = item.ptr();
auto& refData = oldPtr.getRefData();
refData.setCount(count); // temporarily undo removal to run ContainerStore::add