1 files changed, 86 insertions, 80 deletions

diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index 76fca7ae..28de9c1e 100644
--- a/src/net/manaserv/inventoryhandler.cpp
+++ b/src/net/manaserv/inventoryhandler.cpp
@@ -26,8 +26,7 @@
 #include "item.h"
 #include "itemshortcut.h"
 #include "localplayer.h"
-
-#include "gui/chat.h"
+#include "playerinfo.h"
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
@@ -36,8 +35,6 @@
 
 #include "resources/iteminfo.h"
 
-#include "log.h" // <<< REMOVE ME!
-
 extern Net::InventoryHandler *inventoryHandler;
 
 namespace ManaServ {
@@ -53,6 +50,8 @@ InventoryHandler::InventoryHandler()
     };
     handledMessages = _messages;
     inventoryHandler = this;
+
+    listen("Item");
 }
 
 void InventoryHandler::handleMessage(Net::MessageIn &msg)
@@ -60,8 +59,8 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
     switch (msg.getId())
     {
         case GPMSG_INVENTORY_FULL:
-            player_node->clearInventory();
-            player_node->mEquipment->setBackend(&mEquips);
+            PlayerInfo::clearInventory();
+            PlayerInfo::getEquipment()->setBackend(&mEquips);
             // no break!
 
         case GPMSG_INVENTORY:
@@ -70,7 +69,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
                 unsigned int slot = msg.readInt8();
                 if (slot == 255)
                 {
-                    player_node->setMoney(msg.readInt32());
+                    PlayerInfo::setAttribute(MONEY, msg.readInt32());
                     continue;
                 }
 
@@ -82,45 +81,94 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
                 else if (slot >= 32 && slot < 32 + getSize(Inventory::INVENTORY))
                 {
                     int amount = id ? msg.readInt8() : 0;
-                    player_node->setInvItem(slot - 32, id, amount);
+                    PlayerInfo::setInventoryItem(slot - 32, id, amount);
                 }
             };
             break;
     }
 }
 
-void InventoryHandler::equipItem(const Item *item)
-{
-    MessageOut msg(PGMSG_EQUIP);
-    msg.writeInt8(item->getInvIndex());
-    gameServerConnection->send(msg);
-}
-
-void InventoryHandler::unequipItem(const Item *item)
-{
-    MessageOut msg(PGMSG_UNEQUIP);
-    msg.writeInt8(item->getInvIndex());
-    gameServerConnection->send(msg);
-
-    // Tidy equipment directly to avoid weapon still shown bug, for instance
-    int equipSlot = item->getInvIndex();
-    logger->log("Unequipping %d", equipSlot);
-    mEquips.setEquipment(equipSlot, 0);
-}
-
-void InventoryHandler::useItem(const Item *item)
+void InventoryHandler::event(const std::string &channel,
+                             const Mana::Event &event)
 {
-    MessageOut msg(PGMSG_USE_ITEM);
-    msg.writeInt8(item->getInvIndex());
-    gameServerConnection->send(msg);
-}
+    if (channel == "Item")
+    {
+        Item *item = event.getItem("item");
+
+        if (!item)
+            return;
+
+        int index = item->getInvIndex();
+
+        if (event.getName() == "doEquip")
+        {
+            MessageOut msg(PGMSG_EQUIP);
+            msg.writeInt8(index);
+            gameServerConnection->send(msg);
+        }
+        else if (event.getName() == "doUnequip")
+        {
+            MessageOut msg(PGMSG_UNEQUIP);
+            msg.writeInt8(index);
+            gameServerConnection->send(msg);
+
+            // Tidy equipment directly to avoid weapon still shown bug, for instance
+            mEquips.setEquipment(index, 0);
+        }
+        else if (event.getName() == "doUse")
+        {
+            MessageOut msg(PGMSG_USE_ITEM);
+            msg.writeInt8(index);
+            gameServerConnection->send(msg);
+        }
+        else if (event.getName() == "doDrop")
+        {
+            int amount = event.getInt("amount", 1);
+
+            MessageOut msg(PGMSG_DROP);
+            msg.writeInt8(index);
+            msg.writeInt8(amount);
+            gameServerConnection->send(msg);
+        }
+        else if (event.getName() == "doSplit")
+        {
+            int amount = event.getInt("amount", 1);
+
+            int newIndex = PlayerInfo::getInventory()->getFreeSlot();
+            if (newIndex > Inventory::NO_SLOT_INDEX)
+            {
+                MessageOut msg(PGMSG_MOVE_ITEM);
+                msg.writeInt8(index);
+                msg.writeInt8(newIndex);
+                msg.writeInt8(amount);
+                gameServerConnection->send(msg);
+            }
+        }
+        else if (event.getName() == "doMove")
+        {
+            int newIndex = event.getInt("newIndex", -1);
+
+            if (newIndex >= 0)
+            {
+                if (index == newIndex)
+                    return;
+
+                MessageOut msg(PGMSG_MOVE_ITEM);
+                msg.writeInt8(index);
+                msg.writeInt8(newIndex);
+                msg.writeInt8(item->getQuantity());
+                gameServerConnection->send(msg);
+            }
+            else
+            {
+                /*int source = event.getInt("source");
+                int destination = event.getInt("destination");
+                int amount = event.getInt("amount", 1);*/
 
-void InventoryHandler::dropItem(const Item *item, int amount)
-{
-    MessageOut msg(PGMSG_DROP);
-    msg.writeInt8(item->getInvIndex());
-    msg.writeInt8(amount);
-    gameServerConnection->send(msg);
+                // TODO
+            }
+        }
+    }
 }
 
 bool InventoryHandler::canSplit(const Item *item)
@@ -128,48 +176,6 @@ bool InventoryHandler::canSplit(const Item *item)
     return item && !item->isEquipment() && item->getQuantity() > 1;
 }
 
-void InventoryHandler::splitItem(const Item *item, int amount)
-{
-    int newIndex = player_node->getInventory()->getFreeSlot();
-    if (newIndex > Inventory::NO_SLOT_INDEX)
-    {
-        MessageOut msg(PGMSG_MOVE_ITEM);
-        msg.writeInt8(item->getInvIndex());
-        msg.writeInt8(newIndex);
-        msg.writeInt8(amount);
-        gameServerConnection->send(msg);
-    }
-}
-
-void InventoryHandler::moveItem(int oldIndex, int newIndex)
-{
-    if (oldIndex == newIndex)
-        return;
-
-    MessageOut msg(PGMSG_MOVE_ITEM);
-    msg.writeInt8(oldIndex);
-    msg.writeInt8(newIndex);
-    msg.writeInt8(player_node->getInventory()->getItem(oldIndex)
-                  ->getQuantity());
-    gameServerConnection->send(msg);
-}
-
-void InventoryHandler::openStorage(int type)
-{
-    // TODO
-}
-
-void InventoryHandler::closeStorage(int type)
-{
-    // TODO
-}
-
-void InventoryHandler::moveItem(int source, int slot, int amount,
-                                int destination)
-{
-    // TODO
-}
-
 size_t InventoryHandler::getSize(int type) const
 {
     switch (type)