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

remove redundant allowedToInsertItems() function from ItemModel

Browse source
This commit is contained in:
Andrei Kortunov 2017-11-11 11:54:18 +04:00
parent 99517d83ea
commit 03f129b53c
5 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,10 +52,9 @@ namespace MWGui
void ContainerWindow::onItemSelected(int index)
{
if (mDragAndDrop->mIsOnDragAndDrop)
if (mDragAndDrop->mIsOnDragAndDrop && mModel)
{
if (mModel && mModel->allowedToInsertItems())
dropItem();
dropItem();
return;
}
@ -105,7 +104,7 @@ namespace MWGui
void ContainerWindow::onBackgroundSelected()
{
if (mDragAndDrop->mIsOnDragAndDrop && mModel && mModel->allowedToInsertItems())
if (mDragAndDrop->mIsOnDragAndDrop && mModel)
dropItem();
}

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

@ -94,11 +94,6 @@ namespace MWGui
return true;
}
bool ItemModel::allowedToInsertItems() const
{
return true;
}
bool ItemModel::onDropItem(const MWWorld::Ptr &item, int count)
{
return true;

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

@ -72,9 +72,6 @@ namespace MWGui
/// Is the player allowed to use items from this item model? (default true)
virtual bool allowedToUseItems() const;
/// Is the player allowed to insert items into this model? (default true)
virtual bool allowedToInsertItems() const;
virtual void onClose()
{
}

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

@ -79,12 +79,6 @@ namespace MWGui
ProxyItemModel::removeItem(item, count);
}
bool PickpocketItemModel::allowedToInsertItems() const
{
// don't allow "reverse pickpocket" (it will be handled by scripts after 1.0)
return false;
}
bool PickpocketItemModel::onDropItem(const MWWorld::Ptr &item, int count)
{
// don't allow "reverse pickpocket" (it will be handled by scripts after 1.0)

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

@ -17,7 +17,6 @@ namespace MWGui
virtual size_t getItemCount();
virtual void update();
virtual void removeItem (const ItemStack& item, size_t count);
virtual bool allowedToInsertItems() const;
virtual void onClose();
virtual bool onDropItem(const MWWorld::Ptr &item, int count);
virtual bool onTakeItem(const MWWorld::Ptr &item, int count);