From a1b0a12f03f56b0a60f9d4f6e28f5714200aee96 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 17 Aug 2015 02:24:43 +0300
Subject: Remove some mode outdated color related code from tmwa.

---
 src/net/tmwa/beinghandler.cpp     | 22 +++++++++++-----------
 src/net/tmwa/inventoryhandler.cpp |  4 ++--
 src/net/tmwa/itemhandler.cpp      |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index d336bdf47..d34594ee6 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -345,17 +345,17 @@ void BeingHandler::processBeingChangeLookContinue(Net::MessageIn &msg,
             break;
         case 3:     // Change lower headgear for eAthena, pants for us
             dstBeing->setSprite(SPRITE_WEAPON, id, color,
-                fromInt(id2, ItemColor));
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
             break;
         case 4:     // Change upper headgear for eAthena, hat for us
             dstBeing->setSprite(SPRITE_CLOTHES_COLOR, id, color,
-                fromInt(id2, ItemColor));
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
             break;
         case 5:     // Change middle headgear for eathena, armor for us
             dstBeing->setSprite(SPRITE_HEAD_BOTTOM, id, color,
-                fromInt(id2, ItemColor));
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
             break;
         case 6:     // eAthena LOOK_HAIR_COLOR
@@ -367,42 +367,42 @@ void BeingHandler::processBeingChangeLookContinue(Net::MessageIn &msg,
             break;
         case 8:     // eAthena LOOK_SHIELD
             dstBeing->setSprite(SPRITE_FLOOR, id, color,
-                fromInt(id2, ItemColor));
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
             break;
         case 9:     // eAthena LOOK_SHOES
             dstBeing->setSprite(SPRITE_HAIR, id, color,
-                fromInt(id2, ItemColor));
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
             break;
         case 10:   // LOOK_GLOVES
             dstBeing->setSprite(SPRITE_SHOES, id, color,
-                fromInt(id2, ItemColor));
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
             break;
         case 11:  // LOOK_CAPE
             dstBeing->setSprite(SPRITE_SHIELD, id, color,
-                fromInt(id2, ItemColor));
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
             break;
         case 12:
             dstBeing->setSprite(SPRITE_HEAD_TOP, id, color,
-                fromInt(id2, ItemColor));
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
             break;
         case 13:
             dstBeing->setSprite(SPRITE_HEAD_MID, id, color,
-                fromInt(id2, ItemColor));
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
             break;
         case 14:
             dstBeing->setSprite(SPRITE_ROBE, id, color,
-                fromInt(id2, ItemColor));
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
             break;
         case 15:
             dstBeing->setSprite(SPRITE_EVOL2, id, color,
-                fromInt(id2, ItemColor));
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
             break;
         case 16:
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 05ed6e40d..98c0a46b6 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -381,7 +381,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
         {
             localPlayer->pickedUp(itemInfo,
                 0,
-                fromInt(identified, ItemColor),
+                ItemColor_one,
                 floorId,
                 pickup);
         }
@@ -392,7 +392,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
         {
             localPlayer->pickedUp(itemInfo,
                 amount,
-                fromInt(identified, ItemColor),
+                ItemColor_one,
                 floorId,
                 Pickup::OKAY);
         }
diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp
index b99ca12dc..58deac0c2 100644
--- a/src/net/tmwa/itemhandler.cpp
+++ b/src/net/tmwa/itemhandler.cpp
@@ -72,7 +72,7 @@ void ItemHandler::processItemDropped(Net::MessageIn &msg)
 {
     const BeingId id = msg.readBeingId("item object id");
     const int itemId = msg.readInt16("item id");
-    const ItemColor identify = fromInt(msg.readUInt8("identify"), ItemColor);
+    const Identified identify = fromInt(msg.readUInt8("identify"), Identified);
     const int x = msg.readInt16("x");
     const int y = msg.readInt16("y");
     const int subX = static_cast<int>(msg.readInt8("sub x"));
@@ -87,8 +87,8 @@ void ItemHandler::processItemDropped(Net::MessageIn &msg)
             0,
             amount,
             0,
+            ItemColor_one,
             identify,
-            Identified_false,
             subX, subY,
             nullptr);
     }
-- 
cgit v1.2.3-70-g09d2