summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/beinghandler.cpp90
-rw-r--r--src/net/eathena/beingrecv.cpp6
-rw-r--r--src/net/eathena/charserverrecv.cpp54
-rw-r--r--src/net/tmwa/beinghandler.cpp30
-rw-r--r--src/net/tmwa/beingrecv.cpp6
-rw-r--r--src/net/tmwa/charserverrecv.cpp60
6 files changed, 82 insertions, 164 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 0243f1899..dbf797e2b 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -50,66 +50,36 @@ void BeingHandler::undress(Being *const being) const
{
if (!being)
return;
- being->setSprite(SPRITE_WEAPON,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_HEAD_BOTTOM,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_HEAD_TOP,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_HEAD_MID,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_CLOTHES_COLOR,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_SHIELD,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_FLOOR,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_ROBE,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_EVOL2,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_EVOL3,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_EVOL4,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_EVOL5,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_EVOL6,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_HAIR,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_SHOES,
- 0,
- std::string(),
- ItemColor_one);
+ being->setSpriteId(SPRITE_WEAPON,
+ 0);
+ being->setSpriteId(SPRITE_HEAD_BOTTOM,
+ 0);
+ being->setSpriteId(SPRITE_HEAD_TOP,
+ 0);
+ being->setSpriteId(SPRITE_HEAD_MID,
+ 0);
+ being->setSpriteId(SPRITE_CLOTHES_COLOR,
+ 0);
+ being->setSpriteId(SPRITE_SHIELD,
+ 0);
+ being->setSpriteId(SPRITE_FLOOR,
+ 0);
+ being->setSpriteId(SPRITE_ROBE,
+ 0);
+ being->setSpriteId(SPRITE_EVOL2,
+ 0);
+ being->setSpriteId(SPRITE_EVOL3,
+ 0);
+ being->setSpriteId(SPRITE_EVOL4,
+ 0);
+ being->setSpriteId(SPRITE_EVOL5,
+ 0);
+ being->setSpriteId(SPRITE_EVOL6,
+ 0);
+ being->setSpriteId(SPRITE_HAIR,
+ 0);
+ being->setSpriteId(SPRITE_SHOES,
+ 0);
}
void BeingHandler::requestRanks(const RankT rank) const
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 2a06e899b..bffa9d274 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -165,10 +165,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
itemColor,
CardsList(cards));
dstBeing->setWeaponId(id);
- dstBeing->setSprite(SPRITE_FLOOR,
- id2,
- std::string(),
- ItemColor_one);
+ dstBeing->setSpriteId(SPRITE_FLOOR,
+ id2);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index 321745312..555a876be 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -147,10 +147,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
tempPlayer->setHairColor(color);
if (hairStyle == 0)
{
- tempPlayer->setSprite(SPRITE_HAIR_COLOR,
- 0,
- std::string(),
- ItemColor_one);
+ tempPlayer->setSpriteId(SPRITE_HAIR_COLOR,
+ 0);
}
else
{
@@ -187,38 +185,22 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
shoes = msg.readInt32("robe");
if (!serverFeatures->haveAdvancedSprites())
{
- tempPlayer->setSprite(SPRITE_HAIR,
- shoes,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_SHOES,
- gloves,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_SHIELD,
- cape,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_HEAD_TOP,
- misc1,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_WEAPON,
- bottomClothes,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_FLOOR,
- shield,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
- hat,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
- topClothes,
- std::string(),
- ItemColor_one);
+ tempPlayer->setSpriteId(SPRITE_HAIR,
+ shoes);
+ tempPlayer->setSpriteId(SPRITE_SHOES,
+ gloves);
+ tempPlayer->setSpriteId(SPRITE_SHIELD,
+ cape);
+ tempPlayer->setSpriteId(SPRITE_HEAD_TOP,
+ misc1);
+ tempPlayer->setSpriteId(SPRITE_WEAPON,
+ bottomClothes);
+ tempPlayer->setSpriteId(SPRITE_FLOOR,
+ shield);
+ tempPlayer->setSpriteId(SPRITE_CLOTHES_COLOR,
+ hat);
+ tempPlayer->setSpriteId(SPRITE_HEAD_BOTTOM,
+ topClothes);
// tempPlayer->setSprite(SPRITE_HEAD_MID, misc2);
}
if (packetVersion >= 20110928)
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 159e56fb8..346aedf58 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -49,26 +49,16 @@ void BeingHandler::undress(Being *const being) const
{
if (!being)
return;
- being->setSprite(SPRITE_WEAPON,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_HEAD_BOTTOM,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_CLOTHES_COLOR,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_HAIR,
- 0,
- std::string(),
- ItemColor_one);
- being->setSprite(SPRITE_SHOES,
- 0,
- std::string(),
- ItemColor_one);
+ being->setSpriteId(SPRITE_WEAPON,
+ 0);
+ being->setSpriteId(SPRITE_HEAD_BOTTOM,
+ 0);
+ being->setSpriteId(SPRITE_CLOTHES_COLOR,
+ 0);
+ being->setSpriteId(SPRITE_HAIR,
+ 0);
+ being->setSpriteId(SPRITE_SHOES,
+ 0);
}
#ifdef EATHENA_SUPPORT
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index d86d8b2ec..2ece0e993 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -148,10 +148,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
"",
ItemColor_one);
dstBeing->setWeaponId(id);
- dstBeing->setSprite(SPRITE_FLOOR,
- id2,
- std::string(),
- ItemColor_one);
+ dstBeing->setSpriteId(SPRITE_FLOOR,
+ id2);
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
case 3: // Change lower headgear for eAthena, pants for us
diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp
index 982779a23..85f06159d 100644
--- a/src/net/tmwa/charserverrecv.cpp
+++ b/src/net/tmwa/charserverrecv.cpp
@@ -124,10 +124,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
msg.readUInt8("unused");
if (hairStyle == 0)
{
- tempPlayer->setSprite(SPRITE_HAIR_COLOR,
- 0,
- std::string(),
- ItemColor_one);
+ tempPlayer->setSpriteId(SPRITE_HAIR_COLOR,
+ 0);
}
else
{
@@ -150,42 +148,24 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
character->data.mStats[Attributes::DEX].base = msg.readUInt8("dex");
character->data.mStats[Attributes::LUK].base = msg.readUInt8("luk");
- tempPlayer->setSprite(SPRITE_HAIR,
- shoes,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_SHOES,
- gloves,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_SHIELD,
- cape,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_HEAD_TOP,
- misc1,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_WEAPON,
- bottomClothes,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_FLOOR,
- shield,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
- hat,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
- topClothes,
- std::string(),
- ItemColor_one);
- tempPlayer->setSprite(SPRITE_HEAD_MID,
- misc2,
- std::string(),
- ItemColor_one);
+ tempPlayer->setSpriteId(SPRITE_HAIR,
+ shoes);
+ tempPlayer->setSpriteId(SPRITE_SHOES,
+ gloves);
+ tempPlayer->setSpriteId(SPRITE_SHIELD,
+ cape);
+ tempPlayer->setSpriteId(SPRITE_HEAD_TOP,
+ misc1);
+ tempPlayer->setSpriteId(SPRITE_WEAPON,
+ bottomClothes);
+ tempPlayer->setSpriteId(SPRITE_FLOOR,
+ shield);
+ tempPlayer->setSpriteId(SPRITE_CLOTHES_COLOR,
+ hat);
+ tempPlayer->setSpriteId(SPRITE_HEAD_BOTTOM,
+ topClothes);
+ tempPlayer->setSpriteId(SPRITE_HEAD_MID,
+ misc2);
character->slot = msg.readUInt8("slot");
const uint8_t sex = CAST_U8(msg.readUInt8("gender"));
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-08 23:14:27 +0000