1 files changed, 73 insertions, 27 deletions

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 16ac5409..31743c57 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -23,14 +23,13 @@
 
 #include "inventory.h"
 #include "item.h"
-#include "localplayer.h"
 #include "units.h"
 #include "keyboardconfig.h"
+#include "playerinfo.h"
 
 #include "gui/itemamount.h"
 #include "gui/setup.h"
 #include "gui/sdlinput.h"
-#include "gui/theme.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/button.h"
@@ -44,6 +43,7 @@
 #include "net/net.h"
 
 #include "resources/iteminfo.h"
+#include "resources/theme.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
@@ -60,6 +60,8 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
     mInventory(inventory),
     mSplit(false)
 {
+    listen(CHANNEL_ATTRIBUTES);
+
     setWindowName(isMainInventory() ? "Inventory" : "Storage");
     setupWindow->registerWindowForReset(this);
     setResizable(true);
@@ -95,7 +97,8 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
             longestUseString = unequip;
         }
 
-        mUseButton = new Button(longestUseString, "use", this);
+        mEquipButton = new Button(_("Equip"), "equip", this);
+        mUseButton = new Button(_("Activate"), "activate", this);
         mDropButton = new Button(_("Drop..."), "drop", this);
         mSplitButton = new Button(_("Split"), "split", this);
         mOutfitButton = new Button(_("Outfits"), "outfit", this);
@@ -109,8 +112,9 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
         place(5, 0, mSlotsBar, 2);
         place(0, 1, invenScroll, 7).setPadding(3);
         place(0, 2, mUseButton);
-        place(1, 2, mDropButton);
-        place(2, 2, mSplitButton);
+        place(1, 2, mEquipButton);
+        place(2, 2, mDropButton);
+        place(3, 2, mSplitButton);
         place(6, 2, mOutfitButton);
 
         updateWeight();
@@ -138,13 +142,19 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
     slotsChanged(mInventory);
 
     if (!isMainInventory())
+    {
         setVisible(true);
+        PlayerInfo::setStorageCount(PlayerInfo::getStorageCount() + 1);
+    }
 }
 
 InventoryWindow::~InventoryWindow()
 {
     instances.remove(this);
     mInventory->removeInventoyListener(this);
+
+    if (!isMainInventory())
+        PlayerInfo::setStorageCount(PlayerInfo::getStorageCount() - 1);
 }
 
 void InventoryWindow::action(const gcn::ActionEvent &event)
@@ -175,17 +185,21 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
     if (!item)
         return;
 
-    if (event.getId() == "use")
+    if (event.getId() == "activate")
+        item->doEvent(EVENT_DOUSE);
+    else if (event.getId() == "equip")
     {
-        if (item->isEquipment())
+        if (item->isEquippable())
         {
             if (item->isEquipped())
-                Net::getInventoryHandler()->unequipItem(item);
+                item->doEvent(EVENT_DOUNEQUIP);
             else
-                Net::getInventoryHandler()->equipItem(item);
+                item->doEvent(EVENT_DOEQUIP);
         }
         else
-            Net::getInventoryHandler()->useItem(item);
+        {
+            item->doEvent(EVENT_DOUSE);
+        }
     }
     else if (event.getId() == "drop")
     {
@@ -234,20 +248,30 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
 
     if (event.getButton() == gcn::MouseEvent::LEFT)
     {
-        if (isStorageActive() && keyboard.isKeyActive(keyboard.KEY_EMOTE))
+        if (instances.size() > 1 && keyboard.isKeyActive(keyboard.KEY_EMOTE))
         {
             Item *item = mItems->getSelectedItem();
 
             if(!item)
                 return;
             if (mInventory->isMainInventory())
-                Net::getInventoryHandler()->moveItem(Inventory::INVENTORY,
-                                            item->getInvIndex(), item->getQuantity(),
-                                            Inventory::STORAGE);
+            {
+                Mana::Event event(EVENT_DOMOVE);
+                event.setItem("item", item);
+                event.setInt("amount", item->getQuantity());
+                event.setInt("source", Inventory::INVENTORY);
+                event.setInt("destination", Inventory::STORAGE);
+                event.trigger(CHANNEL_ITEM);
+            }
             else
-                Net::getInventoryHandler()->moveItem(Inventory::STORAGE,
-                                            item->getInvIndex(), item->getQuantity(),
-                                            Inventory::INVENTORY);
+            {
+                Mana::Event event(EVENT_DOMOVE);
+                event.setItem("item", item);
+                event.setInt("amount", item->getQuantity());
+                event.setInt("source", Inventory::STORAGE);
+                event.setInt("destination", Inventory::INVENTORY);
+                event.trigger(CHANNEL_ITEM);
+            }
         }
     }
 }
@@ -298,26 +322,27 @@ void InventoryWindow::updateButtons()
     if (!item || item->getQuantity() == 0)
     {
         mUseButton->setEnabled(false);
+        mEquipButton->setEnabled(false);
         mDropButton->setEnabled(false);
         mSplitButton->setEnabled(false);
 
         return;
     }
 
-    mUseButton->setEnabled(true);
     mDropButton->setEnabled(true);
 
-    if (item->isEquipment())
+    if (item->getInfo().getEquippable())
     {
         if (item->isEquipped())
-            mUseButton->setCaption(_("Unequip"));
+            mEquipButton->setCaption(_("Unequip"));
         else
-            mUseButton->setCaption(_("Equip"));
+            mEquipButton->setCaption(_("Equip"));
+        mEquipButton->setEnabled(true);
     }
     else
-    {
-        mUseButton->setCaption(_("Use"));
-    }
+        mEquipButton->setEnabled(false);
+
+    mUseButton->setEnabled(item->getInfo().getActivatable());
 
     if (item->getQuantity() > 1)
         mDropButton->setCaption(_("Drop..."));
@@ -343,15 +368,36 @@ void InventoryWindow::close()
     }
     else
     {
-        Net::getInventoryHandler()->closeStorage(Inventory::STORAGE);
+        Mana::Event event(EVENT_DOCLOSEINVENTORY);
+        event.setInt("type", mInventory->getType());
+        event.trigger(CHANNEL_ITEM);
         scheduleDelete();
     }
 }
 
+void InventoryWindow::event(Channels channel, const Mana::Event &event)
+{
+    if (event.getName() == EVENT_UPDATEATTRIBUTE)
+    {
+        int id = event.getInt("id");
+        if (id == TOTAL_WEIGHT ||
+            id == MAX_WEIGHT)
+        {
+            updateWeight();
+        }
+    }
+}
+
 void InventoryWindow::updateWeight()
 {
-    int total = player_node->getTotalWeight();
-    int max = player_node->getMaxWeight();
+    if (!isMainInventory())
+        return;
+
+    int total = PlayerInfo::getAttribute(TOTAL_WEIGHT);
+    int max = PlayerInfo::getAttribute(MAX_WEIGHT);
+
+    if (max <= 0)
+        return;
 
     // Adjust progress bar
     mWeightBar->setProgress((float) total / max);