From f6e76f469a81ff2d9e3714d39d1a8f4012cda2b8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 27 May 2016 23:28:11 +0300 Subject: Fix some false positive asserts in working with hair style equal to zero. --- src/actormanager.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/actormanager.cpp') diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 020d3a9f5..82be50ea8 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -2043,8 +2043,16 @@ Being *ActorManager::cloneBeing(const Being *const srcBeing, const int hairSlot = charServerHandler->hairSprite(); const int hairStyle = -srcBeing->getSpriteID(hairSlot); const ItemColor hairColor = srcBeing->getHairColor(); - dstBeing->setSprite(hairSlot, hairStyle * -1, - ItemDB::get(-hairStyle).getDyeColorsString(hairColor)); + if (hairStyle != 0) + { + dstBeing->setSprite(hairSlot, + hairStyle * -1, + ItemDB::get(-hairStyle).getDyeColorsString(hairColor)); + } + else + { + dstBeing->setSprite(hairSlot, 0, std::string()); + } dstBeing->setHairColor(hairColor); return dstBeing; } -- cgit v1.2.3-60-g2f50