mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:19:56 +00:00
Code Issues Releases Wiki Activity

Add ItemModel::allowedToInsertItems

Browse source
This commit is contained in:
scrawl 2016-03-05 19:53:24 +01:00
parent 373c1e7602
commit 763f647412
5 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwgui/container.cpp
View file

@ -57,7 +57,7 @@ namespace MWGui
{
if (mDragAndDrop->mIsOnDragAndDrop)
{
if (!dynamic_cast<PickpocketItemModel*>(mModel))
if (mModel && mModel->allowedToInsertItems())
dropItem();
return;
}
@ -126,7 +126,7 @@ namespace MWGui
void ContainerWindow::onBackgroundSelected()
{
if (mDragAndDrop->mIsOnDragAndDrop && !dynamic_cast<PickpocketItemModel*>(mModel))
if (mDragAndDrop->mIsOnDragAndDrop && mModel && mModel->allowedToInsertItems())
dropItem();
}

5
apps/openmw/mwgui/itemmodel.cpp
View file

@ -119,6 +119,11 @@ namespace MWGui
return ret;
}
bool ItemModel::allowedToInsertItems() const
{
return true;
}
ProxyItemModel::ProxyItemModel()
: mSourceModel(NULL)

3
apps/openmw/mwgui/itemmodel.hpp
View file

@ -70,6 +70,9 @@ namespace MWGui
virtual MWWorld::Ptr copyItem (const ItemStack& item, size_t count, bool setNewOwner=false) = 0;
virtual void removeItem (const ItemStack& item, size_t count) = 0;
/// Is the player allowed to insert items into this model? (default true)
virtual bool allowedToInsertItems() const;
private:
ItemModel(const ItemModel&);
ItemModel& operator=(const ItemModel&);

6
apps/openmw/mwgui/pickpocketitemmodel.cpp
View file

@ -64,4 +64,10 @@ namespace MWGui
/// \todo check if player is detected
}
bool PickpocketItemModel::allowedToInsertItems() const
{
// don't allow "reverse pickpocket" (yet)
return false;
}
}

1
apps/openmw/mwgui/pickpocketitemmodel.hpp
View file

@ -15,6 +15,7 @@ namespace MWGui
virtual size_t getItemCount();
virtual void update();
virtual void removeItem (const ItemStack& item, size_t count);
virtual bool allowedToInsertItems() const;
private:
std::vector<ItemStack> mHiddenItems;