From 36d28236321b6a2824ad4f394faeabbf79626808 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Tue, 31 Jul 2007 21:29:00 +0000
Subject: Removed legacy inventory code. Added display of equipment.

---
 src/gui/inventorywindow.cpp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/gui/inventorywindow.cpp')

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 2018c75a..2ad35095 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -109,12 +109,7 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
 
     if (event.getId() == "use") {
         if (item->isEquipment()) {
-            if (item->isEquipped()) {
-                player_node->unequipItem(item);
-            }
-            else {
-                player_node->equipItem(item);
-            }
+            player_node->equipItem(item);
         }
         else {
             player_node->useItem(item);
@@ -215,12 +210,7 @@ void InventoryWindow::updateButtons()
 
     if ((item = mItems->getItem()) && item->isEquipment())
     {
-        if (item->isEquipped()) {
-            mUseButton->setCaption("Unequip");
-        }
-        else {
-            mUseButton->setCaption("Equip");
-        }
+        mUseButton->setCaption("Equip");
     }
     else {
         mUseButton ->setCaption("Use");
-- 
cgit v1.2.3-70-g09d2