Merged revisions 3705-3711,3714,3718,3721-3722,3729-3731,3735,3742 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
(dynamic recoloring of sprites and related changes)

........
  r3705 | gmelquio | 2007-11-03 10:58:25 +0100 (Sat, 03 Nov 2007) | 1 line
  
  Fixed double load of hair graphics.
........
  r3706 | gmelquio | 2007-11-03 22:04:51 +0100 (Sat, 03 Nov 2007) | 1 line
  
  Added automatic recoloring of images. Inspired by fungos' ideas (PR #41).
........
  r3707 | gmelquio | 2007-11-03 22:08:21 +0100 (Sat, 03 Nov 2007) | 1 line
  
  Experimented recoloring on scorpions.
........
  r3708 | gmelquio | 2007-11-04 12:52:44 +0100 (Sun, 04 Nov 2007) | 1 line
  
  Tightened palette handling.
........
  r3709 | gmelquio | 2007-11-04 12:54:31 +0100 (Sun, 04 Nov 2007) | 1 line
  
  Experimented with scorpions again.
........
  r3710 | gmelquio | 2007-11-04 16:40:37 +0100 (Sun, 04 Nov 2007) | 1 line
  
  Applied recoloring to hair styles.
........
  r3711 | gmelquio | 2007-11-04 17:50:37 +0100 (Sun, 04 Nov 2007) | 1 line
  
  Converted slimes to recoloring.
........
  r3742 | gmelquio | 2007-11-16 14:16:00 +0100 (Fri, 16 Nov 2007) | 1 line
  
  Sped up recoloring of transparent pixels.
........

2 files changed, 12 insertions, 8 deletions

diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 74d1e2d1..e54a66ed 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -67,6 +67,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
     Sint16 param1;
     Sint8 type;
     Being *srcBeing, *dstBeing;
+    int hairStyle, hairColor;
 
     switch (msg->getId())
     {
@@ -106,7 +107,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
 
             dstBeing->setWalkSpeed(speed);
             dstBeing->mJob = job;
-            dstBeing->setHairStyle(msg->readInt16());
+            hairStyle = msg->readInt16();
             dstBeing->setVisibleEquipment(
                     Being::WEAPON_SPRITE, msg->readInt16());
             dstBeing->setVisibleEquipment(
@@ -122,7 +123,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             headMid = msg->readInt16();
             dstBeing->setVisibleEquipment(Being::HAT_SPRITE, headTop);
             dstBeing->setVisibleEquipment(Being::TOPCLOTHES_SPRITE, headMid);
-            dstBeing->setHairColor(msg->readInt16());
+            hairColor = msg->readInt16();
             msg->readInt16();  // unknown
             msg->readInt16();  // head dir
             msg->readInt16();  // guild
@@ -132,6 +133,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             msg->readInt16();  // karma
             msg->readInt8();   // unknown
             dstBeing->setGender(1 - msg->readInt8());   // gender
+            dstBeing->setHairStyle(hairStyle, hairColor);
 
             if (msg->getId() == SMSG_BEING_MOVE)
             {
@@ -258,7 +260,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
 
             switch (type) {
                 case 1:
-                    dstBeing->setHairStyle(id);
+                    dstBeing->setHairStyle(id, -1);
                     break;
                 case 2:
                     dstBeing->setVisibleEquipment(Being::WEAPON_SPRITE, id);
@@ -276,7 +278,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
                             Being::TOPCLOTHES_SPRITE, id);
                     break;
                 case 6:
-                    dstBeing->setHairColor(id);
+                    dstBeing->setHairStyle(-1, id);
                     break;
                 default:
                     logger->log("SMSG_BEING_CHANGE_LOOKS: unsupported type: "
@@ -313,7 +315,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
 
             dstBeing->setWalkSpeed(speed);
             dstBeing->mJob = job;
-            dstBeing->setHairStyle(msg->readInt16());
+            hairStyle = msg->readInt16();
             dstBeing->setVisibleEquipment(
                     Being::WEAPON_SPRITE, msg->readInt16());
             msg->readInt16();  // item id 2
@@ -326,7 +328,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
 
             headTop = msg->readInt16();
             headMid = msg->readInt16();
-            dstBeing->setHairColor(msg->readInt16());
+            hairColor = msg->readInt16();
             msg->readInt16();  // unknown
             msg->readInt16();  // head dir
             msg->readInt32();  // guild
@@ -334,6 +336,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             msg->readInt16();  // manner
             msg->readInt8();   // karma
             dstBeing->setGender(1 - msg->readInt8());   // gender
+            dstBeing->setHairStyle(hairStyle, hairColor);
             dstBeing->setVisibleEquipment(
                     Being::BOTTOMCLOTHES_SPRITE, headBottom);
             dstBeing->setVisibleEquipment(Being::HAT_SPRITE, headTop);
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index b25b0453..063be212 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -202,7 +202,7 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     tempPlayer->mMaxMp = msg.readInt16();
     msg.readInt16();                       // speed
     msg.readInt16();                       // class
-    tempPlayer->setHairStyle(msg.readInt16());
+    int hairStyle = msg.readInt16();
     Uint16 weapon = msg.readInt16();
     tempPlayer->setVisibleEquipment(Being::WEAPON_SPRITE, weapon);
     tempPlayer->mLevel = msg.readInt16();
@@ -211,7 +211,8 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     msg.readInt16();                       // shield
     tempPlayer->setVisibleEquipment(Being::HAT_SPRITE, msg.readInt16()); // head option top
     tempPlayer->setVisibleEquipment(Being::TOPCLOTHES_SPRITE, msg.readInt16()); // head option mid
-    tempPlayer->setHairColor(msg.readInt16());
+    int hairColor = msg.readInt16();
+    tempPlayer->setHairStyle(hairStyle, hairColor);
     msg.readInt16();                       // unknown
     tempPlayer->setName(msg.readString(24));
     for (int i = 0; i < 6; i++) {