From 86920f4524a6936e8f90b6651af7ffe07625f315 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 17 Aug 2015 00:57:09 +0300
Subject: Fix colors on equipment.

---
 src/net/eathena/beinghandler.cpp | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 5c531e16a..b7d2a94d8 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -597,21 +597,18 @@ void BeingHandler::processBeingChangeLookContinue(Net::MessageIn &msg,
                 localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
             break;
         case 3:  // LOOK_HEAD_BOTTOM
-            dstBeing->setSprite(SPRITE_WEAPON, id, color,
-                fromInt(id2, ItemColor));
+            dstBeing->setSprite(SPRITE_WEAPON, id, color, itemColor);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
             break;
         case 4:  // LOOK_HEAD_TOP Change upper headgear for eAthena, hat for us
-            dstBeing->setSprite(SPRITE_CLOTHES_COLOR, id, color,
-                fromInt(id2, ItemColor));
+            dstBeing->setSprite(SPRITE_CLOTHES_COLOR, id, color, itemColor);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
             break;
         case 5:  // LOOK_HEAD_MID Change middle headgear for eathena,
                  // armor for us
-            dstBeing->setSprite(SPRITE_HEAD_BOTTOM, id, color,
-                fromInt(id2, ItemColor));
+            dstBeing->setSprite(SPRITE_HEAD_BOTTOM, id, color, itemColor);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
             break;
@@ -626,62 +623,52 @@ void BeingHandler::processBeingChangeLookContinue(Net::MessageIn &msg,
             dstBeing->setLook(static_cast<uint8_t>(id));
             break;
         case 8:  // eAthena LOOK_SHIELD
-            dstBeing->setSprite(SPRITE_FLOOR, id, color,
-                fromInt(id2, ItemColor));
+            dstBeing->setSprite(SPRITE_FLOOR, id, color, itemColor);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
             break;
         case 9:  // eAthena LOOK_SHOES
-            dstBeing->setSprite(SPRITE_HAIR, id, color,
-                fromInt(id2, ItemColor));
+            dstBeing->setSprite(SPRITE_HAIR, id, color, itemColor);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
             break;
         case 10:  // LOOK_GLOVES
-            dstBeing->setSprite(SPRITE_SHOES, id, color,
-                fromInt(id2, ItemColor));
+            dstBeing->setSprite(SPRITE_SHOES, id, color, itemColor);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
             break;
         case 11:  // LOOK_FLOOR
-            dstBeing->setSprite(SPRITE_SHIELD, id, color,
-                fromInt(id2, ItemColor));
+            dstBeing->setSprite(SPRITE_SHIELD, id, color, itemColor);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
             break;
         case 12:  // LOOK_ROBE
-            dstBeing->setSprite(SPRITE_HEAD_TOP, id, color,
-                fromInt(id2, ItemColor));
+            dstBeing->setSprite(SPRITE_HEAD_TOP, id, color, itemColor);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
             break;
         case 13:  // COSTUME_HEAD_TOP
-            dstBeing->setSprite(SPRITE_HEAD_MID, id, color,
-                fromInt(id2, ItemColor));
+            dstBeing->setSprite(SPRITE_HEAD_MID, id, color, itemColor);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
             break;
         case 14:  // COSTUME_HEAD_MID
-            dstBeing->setSprite(SPRITE_ROBE, id, color,
-                fromInt(id2, ItemColor));
+            dstBeing->setSprite(SPRITE_ROBE, id, color, itemColor);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
             break;
         case 15:  // COSTUME_HEAD_LOW
-            dstBeing->setSprite(SPRITE_EVOL2, id, color,
-                fromInt(id2, ItemColor));
+            dstBeing->setSprite(SPRITE_EVOL2, id, color, itemColor);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
             break;
         case 16:  // COSTUME_GARMENT
-            dstBeing->setSprite(SPRITE_EVOL3, id, color,
-                fromInt(id2, ItemColor));
+            dstBeing->setSprite(SPRITE_EVOL3, id, color, itemColor);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL3);
             break;
         case 17:  // ARMOR
-            dstBeing->setSprite(SPRITE_EVOL4, id, color,
-                fromInt(id2, ItemColor));
+            dstBeing->setSprite(SPRITE_EVOL4, id, color, itemColor);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL4);
             break;
-- 
cgit v1.2.3-70-g09d2