krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests 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; MWWorld::Ptr victim;
bool isAllowed = true;
const MWWorld::CellRef* ownerCellRef = &item.getCellRef(); const MWWorld::CellRef* ownerCellRef = &item.getCellRef();
if (!container.isEmpty()) if (!container.isEmpty())
{ {
// Inherit the owner of the container // Inherit the owner of the container
ownerCellRef = &container.getCellRef(); ownerCellRef = &container.getCellRef();
isAllowed = isAllowedToUse(ptr, container, victim);
} }
else else
{ {
isAllowed = isAllowedToUse(ptr, item, victim);
if (!item.getCellRef().hasContentFile()) if (!item.getCellRef().hasContentFile())
{ {
// this is a manually placed item, which means it was already stolen // 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; return;
Owner owner; Owner owner;