Merged testing branch into master.

1 files changed, 43 insertions, 21 deletions

diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index 28de9c1e..da1abab5 100644
--- a/src/net/manaserv/inventoryhandler.cpp
+++ b/src/net/manaserv/inventoryhandler.cpp
@@ -46,6 +46,7 @@ InventoryHandler::InventoryHandler()
     static const Uint16 _messages[] = {
         GPMSG_INVENTORY_FULL,
         GPMSG_INVENTORY,
+        GPMSG_EQUIP,
         0
     };
     handledMessages = _messages;
@@ -59,31 +60,50 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
     switch (msg.getId())
     {
         case GPMSG_INVENTORY_FULL:
-            PlayerInfo::clearInventory();
-            PlayerInfo::getEquipment()->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--)
                 {
-                    PlayerInfo::setAttribute(MONEY, 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)
+                while (msg.getUnreadLength())
                 {
-                    mEquips.setEquipment(slot, id);
+                    unsigned int slot = msg.readInt8();
+                    unsigned int ref = msg.readInt16();
+
+                    mEquips.addEquipment(slot, ref);
                 }
-                else if (slot >= 32 && slot < 32 + getSize(Inventory::INVENTORY))
+            }
+            break;
+
+        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;
+
+        case GPMSG_EQUIP:
+            while (msg.getUnreadLength())
+            {
+                unsigned int ref = msg.readInt16();
+                int count = msg.readInt8();
+                while (count--)
                 {
-                    int amount = id ? msg.readInt8() : 0;
-                    PlayerInfo::setInventoryItem(slot - 32, id, amount);
+                    unsigned int slot = msg.readInt8();
+                    unsigned int used = msg.readInt8();
+
+                    mEquips.setEquipment(slot, used, ref);
                 }
-            };
+            }
             break;
     }
 }
@@ -112,8 +132,9 @@ void InventoryHandler::event(const std::string &channel,
             msg.writeInt8(index);
             gameServerConnection->send(msg);
 
-            // Tidy equipment directly to avoid weapon still shown bug, for instance
-            mEquips.setEquipment(index, 0);
+            // Tidy equipment directly to avoid weapon still shown bug,
+            // for instance.
+            mEquips.setEquipment(index, 0, 0);
         }
         else if (event.getName() == "doUse")
         {
@@ -173,7 +194,8 @@ void InventoryHandler::event(const std::string &channel,
 
 bool InventoryHandler::canSplit(const Item *item)
 {
-    return item && !item->isEquipment() && item->getQuantity() > 1;
+    return item && !item->getInfo().getEquippable()
+           && item->getQuantity() > 1;
 }
 
 size_t InventoryHandler::getSize(int type) const