summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/beinghandler.cpp15
-rw-r--r--src/net/tmwa/beingrecv.cpp39
-rw-r--r--src/net/tmwa/charserverrecv.cpp36
3 files changed, 60 insertions, 30 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index a98db8a3a..ec8aee8ef 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -54,31 +54,36 @@ void BeingHandler::undress(Being *const being) const
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
being->setSprite(SPRITE_HEAD_BOTTOM,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
being->setSprite(SPRITE_CLOTHES_COLOR,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
being->setSprite(SPRITE_HAIR,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
being->setSprite(SPRITE_SHOES,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
}
#ifdef EATHENA_SUPPORT
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 9cc5090ac..57b295a8d 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -148,13 +148,15 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
"",
ItemColor_one,
IsWeapon_true,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
dstBeing->setSprite(SPRITE_FLOOR,
id2,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
case 3: // Change lower headgear for eAthena, pants for us
@@ -163,7 +165,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
break;
case 4: // Change upper headgear for eAthena, hat for us
@@ -172,7 +175,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
break;
case 5: // Change middle headgear for eathena, armor for us
@@ -181,7 +185,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
break;
case 6: // eAthena LOOK_HAIR_COLOR
@@ -197,7 +202,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
case 9: // eAthena LOOK_SHOES
@@ -206,7 +212,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
break;
case 10: // LOOK_GLOVES
@@ -215,7 +222,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
break;
case 11: // LOOK_CAPE
@@ -224,7 +232,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
break;
case 12:
@@ -233,7 +242,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
break;
case 13:
@@ -242,7 +252,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
break;
case 14:
@@ -251,7 +262,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
break;
case 15:
@@ -260,7 +272,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
break;
case 16:
diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp
index ba4088898..15c8aa7a0 100644
--- a/src/net/tmwa/charserverrecv.cpp
+++ b/src/net/tmwa/charserverrecv.cpp
@@ -109,7 +109,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
"",
ItemColor_one,
IsWeapon_true,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
data.mAttributes[Attributes::LEVEL] = msg.readInt16("level");
@@ -130,7 +131,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
}
else
{
@@ -139,7 +141,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
ItemDB::get(-hairStyle).getDyeColorsString(hairColor),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
}
tempPlayer->setHairColor(hairColor);
@@ -160,55 +163,64 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
tempPlayer->setSprite(SPRITE_SHOES,
gloves,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
tempPlayer->setSprite(SPRITE_SHIELD,
cape,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
tempPlayer->setSprite(SPRITE_HEAD_TOP,
misc1,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
tempPlayer->setSprite(SPRITE_WEAPON,
bottomClothes,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
tempPlayer->setSprite(SPRITE_FLOOR,
shield,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
hat,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
topClothes,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
tempPlayer->setSprite(SPRITE_HEAD_MID,
misc2,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false);
+ IsTempSprite_false,
+ nullptr);
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-09 09:27:23 +0000