Fix some false positive asserts in working with hair style equal to zero.

2 files changed, 52 insertions, 9 deletions

diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 5c5e18ce8..5d4c59d00 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -380,8 +380,20 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
         dstBeing->setGender(Being::intToGender(gender));
         dstBeing->setHairColor(hairColor);
         // Set these after the gender, as the sprites may be gender-specific
-        Ea::BeingRecv::setSprite(dstBeing, SPRITE_HAIR_COLOR, hairStyle * -1,
-            ItemDB::get(-hairStyle).getDyeColorsString(hairColor));
+        if (hairStyle == 0)
+        {
+            Ea::BeingRecv::setSprite(dstBeing,
+                SPRITE_HAIR_COLOR,
+                0,
+                std::string());
+        }
+        else
+        {
+            Ea::BeingRecv::setSprite(dstBeing,
+                SPRITE_HAIR_COLOR,
+                hairStyle * -1,
+                ItemDB::get(-hairStyle).getDyeColorsString(hairColor));
+        }
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_WEAPON, headBottom);
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_HEAD_BOTTOM, headMid);
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_CLOTHES_COLOR, headTop);
@@ -568,8 +580,20 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
         dstBeing->setGender(Being::intToGender(gender));
         dstBeing->setHairColor(hairColor);
         // Set these after the gender, as the sprites may be gender-specific
-        Ea::BeingRecv::setSprite(dstBeing, SPRITE_HAIR_COLOR, hairStyle * -1,
-            ItemDB::get(-hairStyle).getDyeColorsString(hairColor));
+        if (hairStyle == 0)
+        {
+            Ea::BeingRecv::setSprite(dstBeing,
+                SPRITE_HAIR_COLOR,
+                0,
+                std::string());
+        }
+        else
+        {
+            Ea::BeingRecv::setSprite(dstBeing,
+                SPRITE_HAIR_COLOR,
+                hairStyle * -1,
+                ItemDB::get(-hairStyle).getDyeColorsString(hairColor));
+        }
         if (!serverFeatures->haveMove3())
         {
             Ea::BeingRecv::setSprite(dstBeing, SPRITE_WEAPON, headBottom);
@@ -758,8 +782,20 @@ void BeingRecv::processBeingSpawn(Net::MessageIn &msg)
         dstBeing->setGender(Being::intToGender(gender));
         dstBeing->setHairColor(hairColor);
         // Set these after the gender, as the sprites may be gender-specific
-        Ea::BeingRecv::setSprite(dstBeing, SPRITE_HAIR_COLOR, hairStyle * -1,
-            ItemDB::get(-hairStyle).getDyeColorsString(hairColor));
+        if (hairStyle == 0)
+        {
+            Ea::BeingRecv::setSprite(dstBeing,
+                SPRITE_HAIR_COLOR,
+                0,
+                std::string());
+        }
+        else
+        {
+            Ea::BeingRecv::setSprite(dstBeing,
+                SPRITE_HAIR_COLOR,
+                hairStyle * -1,
+                ItemDB::get(-hairStyle).getDyeColorsString(hairColor));
+        }
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_WEAPON, headBottom);
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_HEAD_BOTTOM, headMid);
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_CLOTHES_COLOR, headTop);
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index a1417b9c8..fcf90acc9 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -141,9 +141,16 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
 
     const ItemColor color = fromInt(msg.readInt16("hair color"), ItemColor);
     tempPlayer->setHairColor(color);
-    tempPlayer->setSprite(SPRITE_HAIR_COLOR, hairStyle * -1,
-        ItemDB::get(-hairStyle).getDyeColorsString(
-        color));
+    if (hairStyle == 0)
+    {
+        tempPlayer->setSprite(SPRITE_HAIR_COLOR, 0, std::string());
+    }
+    else
+    {
+        tempPlayer->setSprite(SPRITE_HAIR_COLOR, hairStyle * -1,
+            ItemDB::get(-hairStyle).getDyeColorsString(
+            color));
+    }
 
     const uint16_t look = msg.readInt16("clothes color");
     tempPlayer->setSubtype(fromInt(race, BeingTypeId), look);