diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-02-21 23:23:24 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-02-21 23:23:24 +0100 |
| commit | 458401d64fbe500295cc8e903702638fde0ab934 (patch) | |
| tree | 3d1c606f118dba2b4f38fa80614bf30fdc12277c /src/gui | |
| parent | e6cd1f9cb82811d05e08aef0493eeba9cc41a95d (diff) | |
| parent | d4bb2d1d0e82ca9d046f9b2346a7893ca11e8d9c (diff) | |
| download | mana-458401d64fbe500295cc8e903702638fde0ab934.tar.gz mana-458401d64fbe500295cc8e903702638fde0ab934.tar.bz2 mana-458401d64fbe500295cc8e903702638fde0ab934.tar.xz mana-458401d64fbe500295cc8e903702638fde0ab934.zip | |
Merge branch '0.5'
Translation file updates ignored.
Conflicts:
src/client.cpp
src/commandhandler.cpp
src/gui/popupmenu.cpp
src/localplayer.cpp
Diffstat (limited to 'src/gui')
| -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 8ff638c2..f5259c35 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -353,6 +353,11 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item, if (isInventory) { + if (PlayerInfo::getStorageCount() > 0) + { + mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store"))); + } + if (item->getInfo().getEquippable()) { if (item->isEquipped()) @@ -372,11 +377,6 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item, { mBrowserBox->addRow(strprintf("@@split|%s@@", _("Split"))); } - - if (PlayerInfo::getStorageCount() > 0) - { - mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store"))); - } } // Assume in storage for now // TODO: make this whole system more flexible, if needed |