summaryrefslogtreecommitdiff
path: root/src/actormanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-21 15:27:11 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-21 15:27:11 +0300
commitfbadc806e050929f44b54fc2973a28d2fdfc516c (patch)
treeb233a68db2a42025cc68934cd0f71ca21120c581 /src/actormanager.cpp
parent3d524b386e3dd6d89d481749cd0015bff247a703 (diff)
downloadmanaverse-fbadc806e050929f44b54fc2973a28d2fdfc516c.tar.gz
manaverse-fbadc806e050929f44b54fc2973a28d2fdfc516c.tar.bz2
manaverse-fbadc806e050929f44b54fc2973a28d2fdfc516c.tar.xz
manaverse-fbadc806e050929f44b54fc2973a28d2fdfc516c.zip
In Being split setSprite into setSpriteColor and setSpriteColorId.
Diffstat (limited to 'src/actormanager.cpp')
-rw-r--r--src/actormanager.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 6bae927e9..df87ca937 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -2038,9 +2038,8 @@ Being *ActorManager::cloneBeing(const Being *const srcBeing,
{
const int spriteId = srcBeing->getSpriteID(slot);
const ItemColor color = srcBeing->getSpriteColor(slot);
- dstBeing->setSprite(slot,
+ dstBeing->setSpriteColorId(slot,
spriteId,
- std::string(),
color);
}
const int hairSlot = charServerHandler->hairSprite();
@@ -2048,17 +2047,13 @@ Being *ActorManager::cloneBeing(const Being *const srcBeing,
const ItemColor hairColor = srcBeing->getHairColor();
if (hairStyle != 0)
{
- dstBeing->setSprite(hairSlot,
+ dstBeing->setSpriteColor(hairSlot,
hairStyle * -1,
- ItemDB::get(-hairStyle).getDyeColorsString(hairColor),
- ItemColor_one);
+ ItemDB::get(-hairStyle).getDyeColorsString(hairColor));
}
else
{
- dstBeing->setSprite(hairSlot,
- 0,
- std::string(),
- ItemColor_one);
+ dstBeing->unSetSprite(hairSlot);
}
dstBeing->setHairColor(hairColor);
return dstBeing;