summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-08 20:16:41 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-08 20:16:41 +0300
commit845a02e65d8077f4079724a106f75470984df8d2 (patch)
treee6ab2efdd3d408dbb235fc6b3f7591ac0b017a51 /src/being
parent93e5a6fbfba642e4e3ff85dcf7bc3c02bada5649 (diff)
downloadplus-845a02e65d8077f4079724a106f75470984df8d2.tar.gz
plus-845a02e65d8077f4079724a106f75470984df8d2.tar.bz2
plus-845a02e65d8077f4079724a106f75470984df8d2.tar.xz
plus-845a02e65d8077f4079724a106f75470984df8d2.zip
Simplify set weapon sprite.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp19
-rw-r--r--src/being/being.h4
2 files changed, 3 insertions, 20 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 7cd645b17..db8eec991 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -500,7 +500,6 @@ void Being::setSubtype(const BeingTypeId subtype,
id,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
}
}
@@ -514,7 +513,6 @@ void Being::setSubtype(const BeingTypeId subtype,
id,
info.getColor(fromInt(mLook, ItemColor)),
ItemColor_one,
- IsWeapon_false,
nullptr);
}
}
@@ -2479,8 +2477,7 @@ void Being::updateColors()
void Being::updateSprite(const unsigned int slot,
const int id,
const std::string &restrict color,
- const ItemColor colorId,
- const IsWeapon isWeapon) restrict2
+ const ItemColor colorId) restrict2
{
if (!charServerHandler || slot >= charServerHandler->maxSprite())
return;
@@ -2490,14 +2487,13 @@ void Being::updateSprite(const unsigned int slot,
if (slot && mSpriteIDs[slot] == id)
return;
- setSprite(slot, id, color, colorId, isWeapon, nullptr);
+ setSprite(slot, id, color, colorId, nullptr);
}
void Being::setSprite(const unsigned int slot,
const int id,
std::string color,
ItemColor colorId,
- const IsWeapon isWeapon,
const int *const cards) restrict2
{
if (!charServerHandler || slot >= charServerHandler->maxSprite())
@@ -2525,8 +2521,6 @@ void Being::setSprite(const unsigned int slot,
removeSprite(slot);
mSpriteDraw[slot] = 0;
- if (isWeapon == IsWeapon_true)
- mEquippedWeapon = nullptr;
const int id1 = mSpriteIDs[slot];
if (id1)
{
@@ -2582,9 +2576,6 @@ void Being::setSprite(const unsigned int slot,
addItemParticles(id, info.getDisplay());
- if (isWeapon == IsWeapon_true)
- mEquippedWeapon = &ItemDB::get(id);
-
setAction(mAction, 0);
if (equipmentSprite)
{
@@ -2696,7 +2687,6 @@ void Being::setSpriteID(const unsigned int slot,
id,
mSpriteColors[slot],
ItemColor_one,
- IsWeapon_false,
nullptr);
}
@@ -2707,7 +2697,6 @@ void Being::setSpriteColor(const unsigned int slot,
mSpriteIDs[slot],
color,
ItemColor_one,
- IsWeapon_false,
nullptr);
}
@@ -2719,7 +2708,6 @@ void Being::setHairStyle(const unsigned int slot,
id,
ItemDB::get(id).getDyeColorsString(mHairColor),
ItemColor_one,
- IsWeapon_false,
nullptr);
// dumpSprites();
}
@@ -2735,7 +2723,6 @@ void Being::setHairColor(const unsigned int slot,
mSpriteIDs[slot],
ItemDB::get(id).getDyeColorsString(color),
ItemColor_one,
- IsWeapon_false,
nullptr);
}
}
@@ -2925,7 +2912,6 @@ void Being::setGender(const GenderT gender) restrict2
mSpriteIDs[i],
mSpriteColors[i],
ItemColor_one,
- IsWeapon_false,
nullptr);
}
}
@@ -3772,7 +3758,6 @@ void Being::undressItemById(const int id) restrict2
0,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
break;
}
diff --git a/src/being/being.h b/src/being/being.h
index 7e3ec2b55..2fd5ed672 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -323,7 +323,6 @@ class Being notfinal : public ActorSprite,
const int id,
std::string color,
ItemColor colorId,
- const IsWeapon isWeapon,
const int *const cards) restrict2;
void setWeaponId(const int id) restrict2;
@@ -336,8 +335,7 @@ class Being notfinal : public ActorSprite,
void updateSprite(const unsigned int slot,
const int id,
const std::string &restrict color = "",
- const ItemColor colorId = ItemColor_one,
- const IsWeapon isWeapon = IsWeapon_false)
+ const ItemColor colorId = ItemColor_one)
restrict2;
void setSpriteID(const unsigned int slot,