summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-08 17:22:18 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-08 17:22:18 +0300
commit8cdbcd738db5477a72b8c7b11c4b0f160f5ac2b6 (patch)
tree04b3a9384dd92db372953bfbfcabec53d368fb41 /src/being
parent326318d644c91f785e98a5b36fe350a95fdd5760 (diff)
downloadplus-8cdbcd738db5477a72b8c7b11c4b0f160f5ac2b6.tar.gz
plus-8cdbcd738db5477a72b8c7b11c4b0f160f5ac2b6.tar.bz2
plus-8cdbcd738db5477a72b8c7b11c4b0f160f5ac2b6.tar.xz
plus-8cdbcd738db5477a72b8c7b11c4b0f160f5ac2b6.zip
Remove default value from parameter colorId in Being->setSprite.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp36
-rw-r--r--src/being/being.h2
2 files changed, 28 insertions, 10 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 4adc83fcb..69550b6d3 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -495,7 +495,12 @@ void Being::setSubtype(const BeingTypeId subtype,
// TRANSLATORS: default race name
setRaceName(_("Human"));
if (charServerHandler)
- setSprite(charServerHandler->baseSprite(), id, std::string());
+ {
+ setSprite(charServerHandler->baseSprite(),
+ id,
+ std::string(),
+ ItemColor_one);
+ }
}
else
{
@@ -505,7 +510,8 @@ void Being::setSubtype(const BeingTypeId subtype,
{
setSprite(charServerHandler->baseSprite(),
id,
- info.getColor(fromInt(mLook, ItemColor)));
+ info.getColor(fromInt(mLook, ItemColor)),
+ ItemColor_one);
}
}
}
@@ -2604,20 +2610,23 @@ void Being::setSprite(const unsigned int slot,
void Being::setSpriteID(const unsigned int slot,
const int id) restrict2
{
- setSprite(slot, id, mSpriteColors[slot]);
+ setSprite(slot, id, mSpriteColors[slot], ItemColor_one);
}
void Being::setSpriteColor(const unsigned int slot,
const std::string &restrict color) restrict2
{
- setSprite(slot, mSpriteIDs[slot], color);
+ setSprite(slot, mSpriteIDs[slot], color, ItemColor_one);
}
void Being::setHairStyle(const unsigned int slot,
const int id) restrict2
{
// dumpSprites();
- setSprite(slot, id, ItemDB::get(id).getDyeColorsString(mHairColor));
+ setSprite(slot,
+ id,
+ ItemDB::get(id).getDyeColorsString(mHairColor),
+ ItemColor_one);
// dumpSprites();
}
@@ -2630,7 +2639,8 @@ void Being::setHairColor(const unsigned int slot,
{
setSprite(slot,
mSpriteIDs[slot],
- ItemDB::get(id).getDyeColorsString(color));
+ ItemDB::get(id).getDyeColorsString(color),
+ ItemColor_one);
}
}
@@ -2813,8 +2823,13 @@ void Being::setGender(const GenderT gender) restrict2
i < CAST_U32(mSpriteIDs.size());
i++)
{
- if (mSpriteIDs.at(i) != 0)
- setSprite(i, mSpriteIDs.at(i), mSpriteColors.at(i));
+ if (mSpriteIDs[i] != 0)
+ {
+ setSprite(i,
+ mSpriteIDs[i],
+ mSpriteColors[i],
+ ItemColor_one);
+ }
}
updateName();
@@ -3663,7 +3678,10 @@ void Being::undressItemById(const int id) restrict2
{
if (id == mSpriteIDs[f])
{
- setSprite(CAST_U32(f), 0, std::string());
+ setSprite(CAST_U32(f),
+ 0,
+ std::string(),
+ ItemColor_one);
break;
}
}
diff --git a/src/being/being.h b/src/being/being.h
index 28cf7a04a..80752bfd2 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -322,7 +322,7 @@ class Being notfinal : public ActorSprite,
void setSprite(const unsigned int slot,
const int id,
std::string color,
- ItemColor colorId = ItemColor_one,
+ ItemColor colorId,
const IsWeapon isWeapon = IsWeapon_false,
const IsTempSprite isTempSprite = IsTempSprite_false,
const int *const cards = nullptr)