summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/beinghandler.cpp30
-rw-r--r--src/net/eathena/beingrecv.cpp2
-rw-r--r--src/net/eathena/charserverrecv.cpp16
-rw-r--r--src/net/tmwa/beinghandler.cpp10
-rw-r--r--src/net/tmwa/beingrecv.cpp2
-rw-r--r--src/net/tmwa/charserverrecv.cpp18
6 files changed, 39 insertions, 39 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 39a4460b6..f3de8d925 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -50,21 +50,21 @@ void BeingHandler::undress(Being *const being) const
{
if (!being)
return;
- being->setSprite(SPRITE_WEAPON, 0);
- being->setSprite(SPRITE_HEAD_BOTTOM, 0);
- being->setSprite(SPRITE_HEAD_TOP, 0);
- being->setSprite(SPRITE_HEAD_MID, 0);
- being->setSprite(SPRITE_CLOTHES_COLOR, 0);
- being->setSprite(SPRITE_SHIELD, 0);
- being->setSprite(SPRITE_FLOOR, 0);
- being->setSprite(SPRITE_ROBE, 0);
- being->setSprite(SPRITE_EVOL2, 0);
- being->setSprite(SPRITE_EVOL3, 0);
- being->setSprite(SPRITE_EVOL4, 0);
- being->setSprite(SPRITE_EVOL5, 0);
- being->setSprite(SPRITE_EVOL6, 0);
- being->setSprite(SPRITE_HAIR, 0);
- being->setSprite(SPRITE_SHOES, 0);
+ being->setSprite(SPRITE_WEAPON, 0, std::string());
+ being->setSprite(SPRITE_HEAD_BOTTOM, 0, std::string());
+ being->setSprite(SPRITE_HEAD_TOP, 0, std::string());
+ being->setSprite(SPRITE_HEAD_MID, 0, std::string());
+ being->setSprite(SPRITE_CLOTHES_COLOR, 0, std::string());
+ being->setSprite(SPRITE_SHIELD, 0, std::string());
+ being->setSprite(SPRITE_FLOOR, 0, std::string());
+ being->setSprite(SPRITE_ROBE, 0, std::string());
+ being->setSprite(SPRITE_EVOL2, 0, std::string());
+ being->setSprite(SPRITE_EVOL3, 0, std::string());
+ being->setSprite(SPRITE_EVOL4, 0, std::string());
+ being->setSprite(SPRITE_EVOL5, 0, std::string());
+ being->setSprite(SPRITE_EVOL6, 0, std::string());
+ being->setSprite(SPRITE_HAIR, 0, std::string());
+ being->setSprite(SPRITE_SHOES, 0, std::string());
// being->setSprite(SPRITE_BODY, 0, "", true);
}
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 07779147a..ee31c236d 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -165,7 +165,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
"",
itemColor,
IsWeapon_true);
- dstBeing->setSprite(SPRITE_FLOOR, id2);
+ dstBeing->setSprite(SPRITE_FLOOR, id2, std::string());
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index 598602355..0b3e5b82d 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -182,14 +182,14 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
shoes = msg.readInt32("robe");
if (!serverFeatures->haveAdvancedSprites())
{
- tempPlayer->setSprite(SPRITE_HAIR, shoes);
- tempPlayer->setSprite(SPRITE_SHOES, gloves);
- tempPlayer->setSprite(SPRITE_SHIELD, cape);
- tempPlayer->setSprite(SPRITE_HEAD_TOP, misc1);
- tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes);
- tempPlayer->setSprite(SPRITE_FLOOR, shield);
- tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat);
- tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes);
+ tempPlayer->setSprite(SPRITE_HAIR, shoes, std::string());
+ tempPlayer->setSprite(SPRITE_SHOES, gloves, std::string());
+ tempPlayer->setSprite(SPRITE_SHIELD, cape, std::string());
+ tempPlayer->setSprite(SPRITE_HEAD_TOP, misc1, std::string());
+ tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes, std::string());
+ tempPlayer->setSprite(SPRITE_FLOOR, shield, std::string());
+ tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat, std::string());
+ tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes, std::string());
// tempPlayer->setSprite(SPRITE_HEAD_MID, misc2);
}
if (packetVersion >= 20110928)
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 777dbf706..6a3e8a854 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -49,11 +49,11 @@ void BeingHandler::undress(Being *const being) const
{
if (!being)
return;
- being->setSprite(SPRITE_WEAPON, 0);
- being->setSprite(SPRITE_HEAD_BOTTOM, 0);
- being->setSprite(SPRITE_CLOTHES_COLOR, 0);
- being->setSprite(SPRITE_HAIR, 0);
- being->setSprite(SPRITE_SHOES, 0);
+ being->setSprite(SPRITE_WEAPON, 0, std::string());
+ being->setSprite(SPRITE_HEAD_BOTTOM, 0, std::string());
+ being->setSprite(SPRITE_CLOTHES_COLOR, 0, std::string());
+ being->setSprite(SPRITE_HAIR, 0, std::string());
+ being->setSprite(SPRITE_SHOES, 0, std::string());
// being->setSprite(SPRITE_BODY, 0, "", true);
}
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 5eec60985..31b9bfdd0 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -148,7 +148,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
"",
ItemColor_one,
IsWeapon_true);
- dstBeing->setSprite(SPRITE_FLOOR, id2);
+ dstBeing->setSprite(SPRITE_FLOOR, id2, std::string());
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 18c0ab791..c599f17af 100644
--- a/src/net/tmwa/charserverrecv.cpp
+++ b/src/net/tmwa/charserverrecv.cpp
@@ -148,15 +148,15 @@ 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);
- tempPlayer->setSprite(SPRITE_SHOES, gloves);
- tempPlayer->setSprite(SPRITE_SHIELD, cape);
- tempPlayer->setSprite(SPRITE_HEAD_TOP, misc1);
- tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes);
- tempPlayer->setSprite(SPRITE_FLOOR, shield);
- tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat); // head option top
- tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes);
- tempPlayer->setSprite(SPRITE_HEAD_MID, misc2);
+ tempPlayer->setSprite(SPRITE_HAIR, shoes, std::string());
+ tempPlayer->setSprite(SPRITE_SHOES, gloves, std::string());
+ tempPlayer->setSprite(SPRITE_SHIELD, cape, std::string());
+ tempPlayer->setSprite(SPRITE_HEAD_TOP, misc1, std::string());
+ tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes, std::string());
+ tempPlayer->setSprite(SPRITE_FLOOR, shield, std::string());
+ tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat, std::string());
+ tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes, std::string());
+ tempPlayer->setSprite(SPRITE_HEAD_MID, misc2, std::string());
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-07 07:25:17 +0000