summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/actormanager.cpp3
-rw-r--r--src/being/being.cpp136
-rw-r--r--src/being/being.h14
-rw-r--r--src/gui/windows/charcreatedialog.cpp2
-rw-r--r--src/net/ea/beingrecv.cpp5
-rw-r--r--src/net/ea/beingrecv.h3
-rw-r--r--src/net/eathena/beinghandler.cpp15
-rw-r--r--src/net/eathena/beingrecv.cpp17
-rw-r--r--src/net/eathena/charserverrecv.cpp11
-rw-r--r--src/net/tmwa/beinghandler.cpp5
-rw-r--r--src/net/tmwa/beingrecv.cpp13
-rw-r--r--src/net/tmwa/charserverrecv.cpp12
12 files changed, 113 insertions, 123 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 6d8b637af..2df8ef179 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -2043,7 +2043,6 @@ Being *ActorManager::cloneBeing(const Being *const srcBeing,
std::string(),
color,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
const int hairSlot = charServerHandler->hairSprite();
@@ -2056,7 +2055,6 @@ Being *ActorManager::cloneBeing(const Being *const srcBeing,
ItemDB::get(-hairStyle).getDyeColorsString(hairColor),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
else
@@ -2066,7 +2064,6 @@ Being *ActorManager::cloneBeing(const Being *const srcBeing,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
dstBeing->setHairColor(hairColor);
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 6bda045c9..79d8f975e 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -501,7 +501,6 @@ void Being::setSubtype(const BeingTypeId subtype,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
}
@@ -516,7 +515,6 @@ void Being::setSubtype(const BeingTypeId subtype,
info.getColor(fromInt(mLook, ItemColor)),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
}
@@ -2482,8 +2480,7 @@ void Being::updateSprite(const unsigned int slot,
const int id,
const std::string &restrict color,
const ItemColor colorId,
- const IsWeapon isWeapon,
- const IsTempSprite isTempSprite) restrict2
+ const IsWeapon isWeapon) restrict2
{
if (!charServerHandler || slot >= charServerHandler->maxSprite())
return;
@@ -2493,7 +2490,7 @@ void Being::updateSprite(const unsigned int slot,
if (slot && mSpriteIDs[slot] == id)
return;
- setSprite(slot, id, color, colorId, isWeapon, isTempSprite, nullptr);
+ setSprite(slot, id, color, colorId, isWeapon, nullptr);
}
void Being::setSprite(const unsigned int slot,
@@ -2501,7 +2498,6 @@ void Being::setSprite(const unsigned int slot,
std::string color,
ItemColor colorId,
const IsWeapon isWeapon,
- const IsTempSprite isTempSprite,
const int *const cards) restrict2
{
if (!charServerHandler || slot >= charServerHandler->maxSprite())
@@ -2535,8 +2531,7 @@ void Being::setSprite(const unsigned int slot,
if (id1)
{
const ItemInfo &info = ItemDB::get(id1);
- if (isTempSprite == IsTempSprite_false &&
- mMap &&
+ if (mMap &&
mType == ActorType::Player)
{
const BeingId pet = fromInt(info.getPet(), BeingId);
@@ -2555,8 +2550,7 @@ void Being::setSprite(const unsigned int slot,
int startTime = 0;
AnimatedSprite *restrict equipmentSprite = nullptr;
- if (isTempSprite == IsTempSprite_false &&
- mType == ActorType::Player)
+ if (mType == ActorType::Player)
{
const BeingId pet = fromInt(info.getPet(), BeingId);
if (pet != BeingId_zero)
@@ -2602,14 +2596,94 @@ void Being::setSprite(const unsigned int slot,
}
}
- if (isTempSprite == IsTempSprite_false)
+ mSpriteIDs[slot] = id;
+ mSpriteColors[slot] = color;
+ mSpriteColorsIds[slot] = colorId;
+ recalcSpritesOrder();
+ if (beingEquipmentWindow)
+ beingEquipmentWindow->updateBeing(this);
+}
+
+void Being::setTempSprite(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())
+ return;
+
+ if (slot >= CAST_U32(mSprites.size()))
+ ensureSize(slot + 1);
+
+ if (slot >= CAST_U32(mSpriteIDs.size()))
+ mSpriteIDs.resize(slot + 1, 0);
+
+ if (slot >= CAST_U32(mSpriteColors.size()))
+ mSpriteColors.resize(slot + 1, "");
+
+ if (slot >= CAST_U32(mSpriteColorsIds.size()))
+ mSpriteColorsIds.resize(slot + 1, ItemColor_one);
+
+ // id = 0 means unequip
+ if (id == 0)
{
- mSpriteIDs[slot] = id;
- mSpriteColors[slot] = color;
- mSpriteColorsIds[slot] = colorId;
- recalcSpritesOrder();
- if (beingEquipmentWindow)
- beingEquipmentWindow->updateBeing(this);
+ removeSprite(slot);
+ mSpriteDraw[slot] = 0;
+
+ if (isWeapon == IsWeapon_true)
+ mEquippedWeapon = nullptr;
+ const int id1 = mSpriteIDs[slot];
+ if (id1)
+ removeItemParticles(id1);
+ }
+ else
+ {
+ const ItemInfo &info = ItemDB::get(id);
+ const std::string &restrict filename = info.getSprite(
+ mGender, mSubType);
+ int lastTime = 0;
+ int startTime = 0;
+ AnimatedSprite *restrict equipmentSprite = nullptr;
+
+ if (cards != nullptr)
+ colorId = ItemColorManager::getColorFromCards(cards);
+
+ if (!filename.empty())
+ {
+ if (color.empty())
+ color = info.getDyeColorsString(colorId);
+
+ equipmentSprite = AnimatedSprite::delayedLoad(
+ paths.getStringValue("sprites").append(
+ combineDye(filename, color)));
+ }
+
+ if (equipmentSprite)
+ {
+ equipmentSprite->setSpriteDirection(getSpriteDirection());
+ startTime = getStartTime();
+ lastTime = getLastTime();
+ }
+
+ CompoundSprite::setSprite(slot, equipmentSprite);
+ mSpriteDraw[slot] = id;
+
+ addItemParticles(id, info.getDisplay());
+
+ if (isWeapon == IsWeapon_true)
+ mEquippedWeapon = &ItemDB::get(id);
+
+ setAction(mAction, 0);
+ if (equipmentSprite)
+ {
+ if (lastTime > 0)
+ {
+ equipmentSprite->setLastTime(startTime);
+ equipmentSprite->update(lastTime);
+ }
+ }
}
}
@@ -2621,7 +2695,6 @@ void Being::setSpriteID(const unsigned int slot,
mSpriteColors[slot],
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
@@ -2633,7 +2706,6 @@ void Being::setSpriteColor(const unsigned int slot,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
@@ -2646,7 +2718,6 @@ void Being::setHairStyle(const unsigned int slot,
ItemDB::get(id).getDyeColorsString(mHairColor),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
// dumpSprites();
}
@@ -2663,7 +2734,6 @@ void Being::setHairColor(const unsigned int slot,
ItemDB::get(id).getDyeColorsString(color),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
}
@@ -2854,7 +2924,6 @@ void Being::setGender(const GenderT gender) restrict2
mSpriteColors[i],
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
}
@@ -3424,21 +3493,21 @@ void Being::recalcSpritesOrder() restrict2
if (CAST_U32(remSprite)
!= hairSlot)
{
- setSprite(remSprite, repIt->second,
+ setTempSprite(remSprite,
+ repIt->second,
mSpriteColors[remSprite],
ItemColor_one,
IsWeapon_false,
- IsTempSprite_true,
nullptr);
}
else
{
- setSprite(remSprite, repIt->second,
+ setTempSprite(remSprite,
+ repIt->second,
ItemDB::get(repIt->second)
.getDyeColorsString(mHairColor),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_true,
nullptr);
}
updatedSprite[remSprite] = true;
@@ -3459,22 +3528,22 @@ void Being::recalcSpritesOrder() restrict2
{
if (slot2 != hairSlot)
{
- setSprite(slot2, repIt->second,
+ setTempSprite(slot2,
+ repIt->second,
mSpriteColors[slot2],
ItemColor_one,
IsWeapon_false,
- IsTempSprite_true,
nullptr);
}
else
{
- setSprite(slot2, repIt->second,
+ setTempSprite(slot2,
+ repIt->second,
ItemDB::get(repIt->second)
.getDyeColorsString(
mHairColor),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_true,
nullptr);
}
updatedSprite[slot2] = true;
@@ -3617,12 +3686,11 @@ void Being::recalcSpritesOrder() restrict2
continue;
updatedSprite[slot] = true;
- setSprite(slot,
+ setTempSprite(slot,
id,
mSpriteColors[slot],
ItemColor_one,
IsWeapon_false,
- IsTempSprite_true,
nullptr);
}
}
@@ -3635,12 +3703,11 @@ void Being::recalcSpritesOrder() restrict2
if (updatedSprite[slot] == false &&
mSpriteDraw[slot] != id)
{
- setSprite(static_cast<unsigned int>(slot),
+ setTempSprite(static_cast<unsigned int>(slot),
id,
mSpriteColors[slot],
ItemColor_one,
IsWeapon_false,
- IsTempSprite_true,
nullptr);
}
}
@@ -3716,7 +3783,6 @@ void Being::undressItemById(const int id) restrict2
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
break;
}
diff --git a/src/being/being.h b/src/being/being.h
index 6bfd13fc3..ccabeb36c 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -324,16 +324,20 @@ class Being notfinal : public ActorSprite,
std::string color,
ItemColor colorId,
const IsWeapon isWeapon,
- const IsTempSprite isTempSprite,
- const int *const cards)
- restrict2;
+ const int *const cards) restrict2;
+
+ void setTempSprite(const unsigned int slot,
+ const int id,
+ std::string color,
+ ItemColor colorId,
+ const IsWeapon isWeapon,
+ const int *const cards) restrict2;
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 IsTempSprite isTempSprite = IsTempSprite_false)
+ const IsWeapon isWeapon = IsWeapon_false)
restrict2;
void setSpriteID(const unsigned int slot,
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 72ab6626b..123c38c20 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -161,7 +161,6 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
@@ -776,7 +775,6 @@ void CharCreateDialog::updateHair()
item.getDyeColorsString(fromInt(mHairColor, ItemColor)),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
diff --git a/src/net/ea/beingrecv.cpp b/src/net/ea/beingrecv.cpp
index c37cf2f82..06739043b 100644
--- a/src/net/ea/beingrecv.cpp
+++ b/src/net/ea/beingrecv.cpp
@@ -547,12 +547,11 @@ void BeingRecv::setSprite(Being *const being,
const int id,
const std::string &color,
const ItemColor colorId,
- const IsWeapon isWeapon,
- const IsTempSprite isTempSprite)
+ const IsWeapon isWeapon)
{
if (!being)
return;
- being->updateSprite(slot, id, color, colorId, isWeapon, isTempSprite);
+ being->updateSprite(slot, id, color, colorId, isWeapon);
}
} // namespace Ea
diff --git a/src/net/ea/beingrecv.h b/src/net/ea/beingrecv.h
index 200059327..0da890eb3 100644
--- a/src/net/ea/beingrecv.h
+++ b/src/net/ea/beingrecv.h
@@ -60,8 +60,7 @@ namespace Ea
const int id,
const std::string &color = "",
const ItemColor colorId = ItemColor_one,
- const IsWeapon isWeapon = IsWeapon_false,
- const IsTempSprite isTempSprite = IsTempSprite_false);
+ const IsWeapon isWeapon = IsWeapon_false);
} // namespace BeingRecv
} // namespace Ea
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 8ad438a09..c4b8e85d5 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -55,105 +55,90 @@ void BeingHandler::undress(Being *const being) const
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_HEAD_BOTTOM,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_HEAD_TOP,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_HEAD_MID,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_CLOTHES_COLOR,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_SHIELD,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_FLOOR,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_ROBE,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_EVOL2,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_EVOL3,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_EVOL4,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_EVOL5,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_EVOL6,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_HAIR,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_SHOES,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 0c673be9f..1664cd77a 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -165,14 +165,12 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
"",
itemColor,
IsWeapon_true,
- IsTempSprite_false,
cards);
dstBeing->setSprite(SPRITE_FLOOR,
id2,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
@@ -183,7 +181,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
@@ -194,7 +191,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
@@ -206,7 +202,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
@@ -227,7 +222,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
@@ -238,7 +232,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
@@ -249,7 +242,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
@@ -260,7 +252,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
@@ -271,7 +262,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
@@ -282,7 +272,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
@@ -293,7 +282,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
@@ -304,7 +292,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
@@ -315,7 +302,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL3);
@@ -326,7 +312,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL4);
@@ -337,7 +322,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL5);
@@ -348,7 +332,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL6);
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index 4add9c820..7c8a2d99f 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -134,7 +134,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
"",
ItemColor_one,
IsWeapon_true,
- IsTempSprite_false,
nullptr);
data.mAttributes[Attributes::LEVEL] = msg.readInt16("level");
@@ -154,7 +153,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
else
@@ -165,7 +163,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
color),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
@@ -200,56 +197,48 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_SHOES,
gloves,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_SHIELD,
cape,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_HEAD_TOP,
misc1,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_WEAPON,
bottomClothes,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_FLOOR,
shield,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
hat,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
topClothes,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
// tempPlayer->setSprite(SPRITE_HEAD_MID, misc2);
}
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index ec8aee8ef..c479e4ced 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -54,35 +54,30 @@ void BeingHandler::undress(Being *const being) const
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_HEAD_BOTTOM,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_CLOTHES_COLOR,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_HAIR,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_SHOES,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 57b295a8d..98f030f12 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -148,14 +148,12 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
"",
ItemColor_one,
IsWeapon_true,
- IsTempSprite_false,
nullptr);
dstBeing->setSprite(SPRITE_FLOOR,
id2,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
@@ -165,7 +163,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
break;
@@ -175,7 +172,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
break;
@@ -185,7 +181,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
break;
@@ -202,7 +197,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
@@ -212,7 +206,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
break;
@@ -222,7 +215,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
break;
@@ -232,7 +224,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
break;
@@ -242,7 +233,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
break;
@@ -252,7 +242,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
break;
@@ -262,7 +251,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
break;
@@ -272,7 +260,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
break;
diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp
index 15c8aa7a0..a940799ba 100644
--- a/src/net/tmwa/charserverrecv.cpp
+++ b/src/net/tmwa/charserverrecv.cpp
@@ -109,7 +109,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
"",
ItemColor_one,
IsWeapon_true,
- IsTempSprite_false,
nullptr);
data.mAttributes[Attributes::LEVEL] = msg.readInt16("level");
@@ -131,7 +130,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
else
@@ -141,7 +139,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
ItemDB::get(-hairStyle).getDyeColorsString(hairColor),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
tempPlayer->setHairColor(hairColor);
@@ -163,63 +160,54 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_SHOES,
gloves,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_SHIELD,
cape,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_HEAD_TOP,
misc1,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_WEAPON,
bottomClothes,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_FLOOR,
shield,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
hat,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
topClothes,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_HEAD_MID,
misc2,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
character->slot = msg.readUInt8("slot");
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 21:49:07 +0000