diff options
| author | David Athay <dathay@mini1.local> | 2011-04-06 19:24:23 -0500 |
|---|---|---|
| committer | David Athay <dathay@mini1.local> | 2011-04-06 19:24:23 -0500 |
| commit | 701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01 (patch) | |
| tree | 4f01225b6a3958ce9361fe60533a19d6d522ed48 /src/gui/popupmenu.cpp | |
| parent | 66bd56ebec2bff48fb1484603b41643fd89bf4d6 (diff) | |
| parent | b6f3db30c595d8e89572c78eb82b9823b8491c54 (diff) | |
| download | mana-client-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.tar.gz mana-client-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.tar.bz2 mana-client-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.tar.xz mana-client-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.zip | |
Merge branch '0.5' of git://gitorious.org/mana/mana into 0.5
Diffstat (limited to 'src/gui/popupmenu.cpp')
| -rw-r--r-- | src/gui/popupmenu.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 409a0eda..fa068cda 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -344,6 +344,11 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item, if (isInventory) { + if (InventoryWindow::isStorageActive()) + { + mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store"))); + } + if (item->isEquipment()) { if (item->isEquipped()) @@ -363,11 +368,6 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item, { mBrowserBox->addRow(strprintf("@@split|%s@@", _("Split"))); } - - if (InventoryWindow::isStorageActive()) - { - mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store"))); - } } // Assume in storage for now // TODO: make this whole system more flexible, if needed |