From f6e76f469a81ff2d9e3714d39d1a8f4012cda2b8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 27 May 2016 23:28:11 +0300
Subject: Fix some false positive asserts in working with hair style equal to
 zero.

---
 src/net/tmwa/beingrecv.cpp | 74 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 64 insertions(+), 10 deletions(-)

(limited to 'src/net/tmwa/beingrecv.cpp')

diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 04c4a0444..cb5eefd92 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -316,8 +316,18 @@ void BeingRecv::processPlayerUpdate1(Net::MessageIn &msg)
         dstBeing->updateSprite(SPRITE_WEAPON, headBottom);
         dstBeing->updateSprite(SPRITE_HEAD_BOTTOM, headMid);
         dstBeing->updateSprite(SPRITE_CLOTHES_COLOR, headTop);
-        dstBeing->updateSprite(SPRITE_HAIR_COLOR, hairStyle * -1,
-            ItemDB::get(-hairStyle).getDyeColorsString(hairColor));
+        if (hairStyle == 0)
+        {
+            dstBeing->updateSprite(SPRITE_HAIR_COLOR,
+                0,
+                std::string());
+        }
+        else
+        {
+            dstBeing->updateSprite(SPRITE_HAIR_COLOR,
+                hairStyle * -1,
+                ItemDB::get(-hairStyle).getDyeColorsString(hairColor));
+        }
         dstBeing->setHairColor(hairColor);
     }
     localPlayer->imitateOutfit(dstBeing);
@@ -448,8 +458,18 @@ void BeingRecv::processPlayerUpdate2(Net::MessageIn &msg)
         dstBeing->updateSprite(SPRITE_WEAPON, headBottom);
         dstBeing->updateSprite(SPRITE_HEAD_BOTTOM, headMid);
         dstBeing->updateSprite(SPRITE_CLOTHES_COLOR, headTop);
-        dstBeing->updateSprite(SPRITE_HAIR_COLOR, hairStyle * -1,
-            ItemDB::get(-hairStyle).getDyeColorsString(hairColor));
+        if (hairStyle == 0)
+        {
+            dstBeing->updateSprite(SPRITE_HAIR_COLOR,
+                0,
+                std::string());
+        }
+        else
+        {
+            dstBeing->updateSprite(SPRITE_HAIR_COLOR,
+                hairStyle * -1,
+                ItemDB::get(-hairStyle).getDyeColorsString(hairColor));
+        }
         dstBeing->setHairColor(hairColor);
     }
     localPlayer->imitateOutfit(dstBeing);
@@ -580,8 +600,18 @@ void BeingRecv::processPlayerMove(Net::MessageIn &msg)
         dstBeing->updateSprite(SPRITE_WEAPON, headBottom);
         dstBeing->updateSprite(SPRITE_HEAD_BOTTOM, headMid);
         dstBeing->updateSprite(SPRITE_CLOTHES_COLOR, headTop);
-        dstBeing->updateSprite(SPRITE_HAIR_COLOR, hairStyle * -1,
-            ItemDB::get(-hairStyle).getDyeColorsString(hairColor));
+        if (hairStyle == 0)
+        {
+            dstBeing->updateSprite(SPRITE_HAIR_COLOR,
+                0,
+                std::string());
+        }
+        else
+        {
+            dstBeing->updateSprite(SPRITE_HAIR_COLOR,
+                hairStyle * -1,
+                ItemDB::get(-hairStyle).getDyeColorsString(hairColor));
+        }
         dstBeing->setHairColor(hairColor);
     }
     localPlayer->imitateOutfit(dstBeing);
@@ -794,8 +824,20 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
         gender &= 3;
         dstBeing->setGender(Being::intToGender(gender));
         // 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));
+        }
         dstBeing->setHairColor(hairColor);
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_WEAPON, headBottom);
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_HEAD_BOTTOM, headMid);
@@ -995,8 +1037,20 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
         gender &= 3;
         dstBeing->setGender(Being::intToGender(gender));
         // 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));
+        }
         dstBeing->setHairColor(hairColor);
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_WEAPON, headBottom);
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_HEAD_BOTTOM, headMid);
-- 
cgit v1.2.3-70-g09d2