1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 11:45:33 +00:00

Merge pull request #1590

This commit is contained in:
scrawl 2017-12-18 20:41:12 +00:00
commit 993982628d
No known key found for this signature in database
GPG key ID: 2E6CC3676024C402

View file

@ -2446,9 +2446,8 @@ namespace MWWorld
if (ptr.getRefData().isDeleted())
return true;
// we should not sell ingrediends from owned organic containers
MWWorld::LiveCellRef<ESM::Container>* ref = ptr.get<ESM::Container>();
if (ref && (ref->mBase->mFlags & ESM::Container::Organic))
// vanilla Morrowind does not allow to sell items from containers with zero capacity
if (ptr.getClass().getCapacity(ptr) <= 0.f)
return true;
if (Misc::StringUtils::ciEqual(ptr.getCellRef().getOwner(), mOwner.getCellRef().getRefId()))