diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-07-31 21:29:00 +0000 |
|---|---|---|
| committer | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-07-31 21:29:00 +0000 |
| commit | 36d28236321b6a2824ad4f394faeabbf79626808 (patch) | |
| tree | 7d2475acf84852f2a21cc29eecbf7524cd58ff52 /src/gui/popupmenu.cpp | |
| parent | c9f930c759004e179545c3b82992e3f8a12345f2 (diff) | |
| download | mana-36d28236321b6a2824ad4f394faeabbf79626808.tar.gz mana-36d28236321b6a2824ad4f394faeabbf79626808.tar.bz2 mana-36d28236321b6a2824ad4f394faeabbf79626808.tar.xz mana-36d28236321b6a2824ad4f394faeabbf79626808.zip | |
Removed legacy inventory code. Added display of equipment.
Diffstat (limited to 'src/gui/popupmenu.cpp')
| -rw-r--r-- | src/gui/popupmenu.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index cc764d35..f308bbfd 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -168,14 +168,7 @@ void PopupMenu::handleLink(const std::string& link) assert(mItem); if (mItem->isEquipment()) { - if (mItem->isEquipped()) - { - player_node->unequipItem(mItem); - } - else - { - player_node->equipItem(mItem); - } + player_node->equipItem(mItem); } else { @@ -221,10 +214,7 @@ void PopupMenu::showPopup(int x, int y, Item *item) if (item->isEquipment()) { - if (item->isEquipped()) - mBrowserBox->addRow("@@use|Unequip@@"); - else - mBrowserBox->addRow("@@use|Equip@@"); + mBrowserBox->addRow("@@use|Equip@@"); } else mBrowserBox->addRow("@@use|Use@@"); |