mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-31 19:45:32 +00:00
Covered forgotten old bound item checks
This commit is contained in:
parent
f250e3df4b
commit
b8851790a6
3 changed files with 3 additions and 9 deletions
|
@ -62,7 +62,7 @@ void InventoryItemModel::removeItem (const ItemStack& item, size_t count)
|
|||
MWWorld::Ptr InventoryItemModel::moveItem(const ItemStack &item, size_t count, ItemModel *otherModel)
|
||||
{
|
||||
// Can't move conjured items: This is a general fix that also takes care of issues with taking conjured items via the 'Take All' button.
|
||||
if (item.mBase.getCellRef().getRefId().size() > 6 && item.mBase.getCellRef().getRefId().substr(0,6) == "bound_")
|
||||
if (item.mFlags & ItemStack::Flag_Bound)
|
||||
return MWWorld::Ptr();
|
||||
|
||||
bool setNewOwner = false;
|
||||
|
|
|
@ -45,11 +45,8 @@ namespace MWGui
|
|||
const ItemStack& item = mSourceModel->getItem(i);
|
||||
|
||||
// Bound items may not be stolen
|
||||
if (item.mBase.getCellRef().getRefId().size() > 6
|
||||
&& item.mBase.getCellRef().getRefId().substr(0,6) == "bound_")
|
||||
{
|
||||
if (item.mFlags & ItemStack::Flag_Bound)
|
||||
continue;
|
||||
}
|
||||
|
||||
if (std::find(mHiddenItems.begin(), mHiddenItems.end(), item) == mHiddenItems.end()
|
||||
&& item.mType != ItemStack::Type_Equipped)
|
||||
|
|
|
@ -169,11 +169,8 @@ namespace MWGui
|
|||
continue;
|
||||
|
||||
// Bound items may not be bought
|
||||
if (item.mBase.getCellRef().getRefId().size() > 6
|
||||
&& item.mBase.getCellRef().getRefId().substr(0,6) == "bound_")
|
||||
{
|
||||
if (item.mFlags & ItemStack::Flag_Bound)
|
||||
continue;
|
||||
}
|
||||
|
||||
// don't show equipped items
|
||||
if(mMerchant.getClass().hasInventoryStore(mMerchant))
|
||||
|
|
Loading…
Reference in a new issue