mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 14:45:35 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1590

Browse source
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
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwworld/worldimp.cpp
View file

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