diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2011-02-19 11:28:08 -0800 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-02-20 00:33:57 +0200 |
| commit | 595a3957e0aa94ca2036055874e03a6d05f67114 (patch) | |
| tree | 2e22d8909b1d52cb5beca8f41eec7f0a1b647107 | |
| parent | 3f00faa305201fabcc74e17dc24da4cefa9dbfa5 (diff) | |
| download | manaverse-1.1.2.20.tar.gz manaverse-1.1.2.20.tar.bz2 manaverse-1.1.2.20.tar.xz manaverse-1.1.2.20.zip | |
Reorder store option to the top, so it is more useful.v1.1.2.20
ManaPlus: small fixes.
| -rw-r--r-- | src/gui/popupmenu.cpp | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 3f5ec478b..8dc392efc 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -1092,6 +1092,24 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item, if (isInventory) { + if (InventoryWindow::isStorageActive()) + { + mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store"))); + if (cnt > 1) + { + if (cnt > 10) + { + mBrowserBox->addRow(strprintf("@@store 10|%s@@", + _("Store 10"))); + } + mBrowserBox->addRow(strprintf("@@store half|%s@@", + _("Store half"))); + mBrowserBox->addRow(strprintf("@@store all|%s@@", + _("Store all"))); + } + mBrowserBox->addRow("##3---"); + } + if (item->isEquipment()) { if (item->isEquipped()) @@ -1110,22 +1128,6 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item, if (Net::getInventoryHandler()->canSplit(item)) mBrowserBox->addRow(strprintf("@@split|%s@@", _("Split"))); - if (InventoryWindow::isStorageActive()) - { - mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store"))); - if (cnt > 1) - { - if (cnt > 10) - { - mBrowserBox->addRow(strprintf("@@store 10|%s@@", - _("Store 10"))); - } - mBrowserBox->addRow(strprintf("@@store half|%s@@", - _("Store half"))); - mBrowserBox->addRow(strprintf("@@store all|%s@@", - _("Store all"))); - } - } } // Assume in storage for now // TODO: make this whole system more flexible, if needed |