diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/gui/inventorywindow.cpp | 9 | ||||
| -rw-r--r-- | src/gui/item_amount.cpp | 8 | ||||
| -rw-r--r-- | src/gui/item_amount.h | 2 |
4 files changed, 15 insertions, 12 deletions
@@ -1,4 +1,10 @@ -2007-11-09 Philipp Sehmisch <tmw@crushnet.org> +2007-11-11 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * src/gui/item_amount.cpp, src/gui/item_amount.h, + src/gui/inventorywindow.cpp: Moved check on dropping 1 item to the + inventory dialog. + +2007-11-09 Philipp Sehmisch <tmw@crushnet.org> * data/graphics/sprites/chest-chainmail-male, data/graphics/sprites/chest-chainmail-female, diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 35cdde93..7b888212 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -122,8 +122,13 @@ void InventoryWindow::action(const gcn::ActionEvent &event) } else if (event.getId() == "drop") { - // Choose amount of items to drop - new ItemAmountWindow(AMOUNT_ITEM_DROP, this, item); + if (item->getQuantity() == 1) { + player_node->dropItem(item, 1); + } + else { + // Choose amount of items to drop + new ItemAmountWindow(AMOUNT_ITEM_DROP, this, item); + } } } diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp index 801a9ce8..f72462f9 100644 --- a/src/gui/item_amount.cpp +++ b/src/gui/item_amount.cpp @@ -35,14 +35,6 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item): Window("Select amount of items to drop.", true, parent), mItem(item) { - //when there is only one item on the stack skip the dialog - if (mItem->getQuantity() == 1) - { - player_node->dropItem(mItem, 1); - scheduleDelete(); - return; - }; - // New labels mItemAmountTextBox = new IntTextBox(1); diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h index 01319012..67002703 100644 --- a/src/gui/item_amount.h +++ b/src/gui/item_amount.h @@ -39,7 +39,7 @@ class Item; #define AMOUNT_ITEM_DROP 2 /** - * Window used for selecting the amount of items to drop. + * Window used for selecting the amount of items to drop or trade. * * \ingroup Interface */ |