From a22d7bce703101ba3ae15cb5b8545381dfe863c4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 23 Nov 2014 15:45:54 +0300
Subject: Move server slot to client slot conversion from ea into eathena and
 tmwa.

---
 src/net/eathena/inventoryhandler.cpp | 29 +++++++++++++++++++++++++++++
 src/net/eathena/inventoryhandler.h   |  3 +++
 src/net/eathena/sprite.h             |  2 ++
 3 files changed, 34 insertions(+)

(limited to 'src/net/eathena')

diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index b55aea477..af08fa1b2 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -41,6 +41,27 @@
 
 extern Net::InventoryHandler *inventoryHandler;
 
+// missing EQUIP_RING1_SLOT
+const Equipment::Slot EQUIP_CONVERT[] =
+{
+    Equipment::EQUIP_PROJECTILE_SLOT,    // 0    0
+    Equipment::EQUIP_FEET_SLOT,          // 1    SPRITE_SHOE
+    Equipment::EQUIP_LEGS_SLOT,          // 2    SPRITE_BOTTOMCLOTHES
+    Equipment::EQUIP_TORSO_SLOT,         // 3    SPRITE_TOPCLOTHES
+    Equipment::EQUIP_GLOVES_SLOT,        // 4    0
+    Equipment::EQUIP_EVOL_RING1_SLOT,    // 5
+    Equipment::EQUIP_PROJECTILE_SLOT,    // 6    0
+    Equipment::EQUIP_HEAD_SLOT,          // 7    SPRITE_HAT
+    Equipment::EQUIP_RING2_SLOT,         // 8    0
+    Equipment::EQUIP_PROJECTILE_SLOT,    // 9    SPRITE_GLOVES
+    Equipment::EQUIP_FIGHT1_SLOT,        // 10   SPRITE_WEAPON
+    Equipment::EQUIP_FIGHT2_SLOT,        // 11   SPRITE_SHIELD
+    Equipment::EQUIP_EVOL_RING2_SLOT,    // 12
+    Equipment::EQUIP_EVOL_RING2_SLOT,    // 13   SPRITE_EVOL2
+    Equipment::EQUIP_COSTUME_ROBE_SLOT,  // 14   SPRITE_EVOL3
+    Equipment::EQUIP_MISSING1_SLOT,      // 15   SPRITE_EVOL4
+};
+
 namespace EAthena
 {
 
@@ -677,4 +698,12 @@ void InventoryHandler::processPlayerItemRentalExpired(Net::MessageIn &msg)
     msg.readInt16("item id");
 }
 
+int InventoryHandler::convertFromServerSlot(const int serverSlot) const
+{
+    if (serverSlot < 0 || serverSlot > 15)
+        return 0;
+
+    return static_cast<int>(EQUIP_CONVERT[serverSlot]);
+}
+
 }  // namespace EAthena
diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h
index 0b9a70237..272d3a82b 100644
--- a/src/net/eathena/inventoryhandler.h
+++ b/src/net/eathena/inventoryhandler.h
@@ -68,6 +68,9 @@ class InventoryHandler final : public MessageHandler,
 
         void selectEgg(const Item *const item) const override final;
 
+        int convertFromServerSlot(const int serverSlot)
+                                  const override final A_WARN_UNUSED;
+
     protected:
         static void processPlayerEquipment(Net::MessageIn &msg);
 
diff --git a/src/net/eathena/sprite.h b/src/net/eathena/sprite.h
index 65bba131c..7d685b988 100644
--- a/src/net/eathena/sprite.h
+++ b/src/net/eathena/sprite.h
@@ -39,6 +39,8 @@ enum
     SPRITE_SHIELD,
     SPRITE_EVOL1,
     SPRITE_EVOL2,
+    SPRITE_EVOL3,
+    SPRITE_EVOL4,
     SPRITE_VECTOREND
 };
 
-- 
cgit v1.2.3-60-g2f50