teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #1482 from akortunov/ownerfix

Browse source 
Inherit owner, if an item is in container (regression #4128)
This commit is contained in:
scrawl 2017-09-27 21:08:54 +00:00 committed by GitHub
commit 1ad6cf90c6
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -1012,14 +1012,17 @@ namespace MWMechanics
MWWorld::Ptr victim;
bool isAllowed = true;
const MWWorld::CellRef* ownerCellRef = &item.getCellRef();
if (!container.isEmpty())
{
// Inherit the owner of the container
ownerCellRef = &container.getCellRef();
isAllowed = isAllowedToUse(ptr, container, victim);
}
else
{
isAllowed = isAllowedToUse(ptr, item, victim);
if (!item.getCellRef().hasContentFile())
{
// this is a manually placed item, which means it was already stolen
@ -1027,7 +1030,7 @@ namespace MWMechanics
}
}
if (isAllowedToUse(ptr, item, victim))
if (isAllowed)
return;
Owner owner;