summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-04 19:24:00 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-04 19:24:00 +0300
commit11af049539ec6b5aed7e956e7a23aeb79746c536 (patch)
treee543c81cbec7a05afc16837188e9e76df66bc4e7
parentdb43ad3b72fe207e6cc03a1fd341ea598d123319 (diff)
downloadmanaverse-11af049539ec6b5aed7e956e7a23aeb79746c536.tar.gz
manaverse-11af049539ec6b5aed7e956e7a23aeb79746c536.tar.bz2
manaverse-11af049539ec6b5aed7e956e7a23aeb79746c536.tar.xz
manaverse-11af049539ec6b5aed7e956e7a23aeb79746c536.zip
Fix inventory "store" button if item was protected.
-rw-r--r--src/gui/windows/inventorywindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 64d9347af..e72945b99 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -366,9 +366,6 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
}
else if (eventId == "drop")
{
- if (PlayerInfo::isItemProtected(item->getId()))
- return;
-
if (isStorageActive())
{
Net::getInventoryHandler()->moveItem2(Inventory::INVENTORY,
@@ -377,6 +374,9 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
}
else
{
+ if (PlayerInfo::isItemProtected(item->getId()))
+ return;
+
if (inputManager.isActionActive(static_cast<int>(Input::KEY_MOD)))
{
PlayerInfo::dropItem(item, item->getQuantity(), true);