1 files changed, 123 insertions, 95 deletions

diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index 76fca7ae..9d2fdfeb 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 {
@@ -49,10 +46,13 @@ InventoryHandler::InventoryHandler()
     static const Uint16 _messages[] = {
         GPMSG_INVENTORY_FULL,
         GPMSG_INVENTORY,
+        GPMSG_EQUIP,
         0
     };
     handledMessages = _messages;
     inventoryHandler = this;
+
+    listen(CHANNEL_ITEM);
 }
 
 void InventoryHandler::handleMessage(Net::MessageIn &msg)
@@ -60,114 +60,142 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
     switch (msg.getId())
     {
         case GPMSG_INVENTORY_FULL:
-            player_node->clearInventory();
-            player_node->mEquipment->setBackend(&mEquips);
-            // no break!
-
-        case GPMSG_INVENTORY:
-            while (msg.getUnreadLength())
             {
-                unsigned int slot = msg.readInt8();
-                if (slot == 255)
+                PlayerInfo::clearInventory();
+                PlayerInfo::getEquipment()->setBackend(&mEquips);
+                int count = msg.readInt16();
+                while (count--)
                 {
-                    player_node->setMoney(msg.readInt32());
-                    continue;
+                    unsigned int slot = msg.readInt16();
+                    int id = msg.readInt16();
+                    unsigned int amount = msg.readInt16();
+                    PlayerInfo::setInventoryItem(slot, id, amount);
                 }
-
-                int id = msg.readInt16();
-                if (slot < EQUIPMENT_SIZE)
-                {
-                    mEquips.setEquipment(slot, id);
-                }
-                else if (slot >= 32 && slot < 32 + getSize(Inventory::INVENTORY))
+                while (msg.getUnreadLength())
                 {
-                    int amount = id ? msg.readInt8() : 0;
-                    player_node->setInvItem(slot - 32, id, amount);
+                    unsigned int slot = msg.readInt8();
+                    unsigned int ref = msg.readInt16();
+
+                    mEquips.addEquipment(slot, ref);
                 }
-            };
+            }
             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)
-{
-    MessageOut msg(PGMSG_USE_ITEM);
-    msg.writeInt8(item->getInvIndex());
-    gameServerConnection->send(msg);
-}
-
-void InventoryHandler::dropItem(const Item *item, int amount)
-{
-    MessageOut msg(PGMSG_DROP);
-    msg.writeInt8(item->getInvIndex());
-    msg.writeInt8(amount);
-    gameServerConnection->send(msg);
-}
+        case GPMSG_INVENTORY:
+            while (msg.getUnreadLength())
+            {
+                unsigned int slot = msg.readInt16();
+                int id = msg.readInt16();
+                unsigned int amount = id ? msg.readInt16() : 0;
+                PlayerInfo::setInventoryItem(slot, id, amount);
+            }
+            break;
 
-bool InventoryHandler::canSplit(const Item *item)
-{
-    return item && !item->isEquipment() && item->getQuantity() > 1;
-}
+        case GPMSG_EQUIP:
+            while (msg.getUnreadLength())
+            {
+                unsigned int ref = msg.readInt16();
+                int count = msg.readInt8();
+                while (count--)
+                {
+                    unsigned int slot = msg.readInt8();
+                    unsigned int used = msg.readInt8();
 
-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);
+                    mEquips.setEquipment(slot, used, ref);
+                }
+            }
+            break;
     }
 }
 
-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)
+void InventoryHandler::event(Channels channel,
+                             const Mana::Event &event)
 {
-    // TODO
-}
+    if (channel == CHANNEL_ITEM)
+    {
+        Item *item = event.getItem("item");
+
+        if (!item)
+            return;
+
+        int index = item->getInvIndex();
+
+        if (event.getName() == EVENT_DOEQUIP)
+        {
+            MessageOut msg(PGMSG_EQUIP);
+            msg.writeInt8(index);
+            gameServerConnection->send(msg);
+        }
+        else if (event.getName() == EVENT_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, 0);
+        }
+        else if (event.getName() == EVENT_DOUSE)
+        {
+            MessageOut msg(PGMSG_USE_ITEM);
+            msg.writeInt8(index);
+            gameServerConnection->send(msg);
+        }
+        else if (event.getName() == EVENT_DODROP)
+        {
+            int amount = event.getInt("amount", 1);
+
+            MessageOut msg(PGMSG_DROP);
+            msg.writeInt8(index);
+            msg.writeInt8(amount);
+            gameServerConnection->send(msg);
+        }
+        else if (event.getName() == EVENT_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() == EVENT_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::closeStorage(int type)
-{
-    // TODO
+                // TODO
+            }
+        }
+    }
 }
 
-void InventoryHandler::moveItem(int source, int slot, int amount,
-                                int destination)
+bool InventoryHandler::canSplit(const Item *item)
 {
-    // TODO
+    return item && !item->getInfo().getEquippable()
+           && item->getQuantity() > 1;
 }
 
 size_t InventoryHandler::getSize(int type) const