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.cpp36
-rw-r--r--src/net/tmwa/charserverrecv.cpp33
3 files changed, 56 insertions, 28 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 159e56fb8..59a34332b 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -52,23 +52,28 @@ void BeingHandler::undress(Being *const being) const
being->setSprite(SPRITE_WEAPON,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_HEAD_BOTTOM,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_CLOTHES_COLOR,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_HAIR,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_SHOES,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
}
#ifdef EATHENA_SUPPORT
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 8a47b1aca..167e0042f 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -151,28 +151,32 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
dstBeing->setSprite(SPRITE_FLOOR,
id2,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
case 3: // Change lower headgear for eAthena, pants for us
dstBeing->setSprite(SPRITE_WEAPON,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
break;
case 4: // Change upper headgear for eAthena, hat for us
dstBeing->setSprite(SPRITE_CLOTHES_COLOR,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
break;
case 5: // Change middle headgear for eathena, armor for us
dstBeing->setSprite(SPRITE_HEAD_BOTTOM,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
break;
case 6: // eAthena LOOK_HAIR_COLOR
@@ -186,56 +190,64 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
dstBeing->setSprite(SPRITE_FLOOR,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
case 9: // eAthena LOOK_SHOES
dstBeing->setSprite(SPRITE_HAIR,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
break;
case 10: // LOOK_GLOVES
dstBeing->setSprite(SPRITE_SHOES,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
break;
case 11: // LOOK_CAPE
dstBeing->setSprite(SPRITE_SHIELD,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
break;
case 12:
dstBeing->setSprite(SPRITE_HEAD_TOP,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
break;
case 13:
dstBeing->setSprite(SPRITE_HEAD_MID,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
break;
case 14:
dstBeing->setSprite(SPRITE_ROBE,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
break;
case 15:
dstBeing->setSprite(SPRITE_EVOL2,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
break;
case 16:
diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp
index 7c638882e..401585fc7 100644
--- a/src/net/tmwa/charserverrecv.cpp
+++ b/src/net/tmwa/charserverrecv.cpp
@@ -127,14 +127,16 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
tempPlayer->setSprite(SPRITE_HAIR_COLOR,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
}
else
{
tempPlayer->setSprite(SPRITE_HAIR_COLOR,
hairStyle * -1,
ItemDB::get(-hairStyle).getDyeColorsString(hairColor),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
}
tempPlayer->setHairColor(hairColor);
@@ -153,39 +155,48 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
tempPlayer->setSprite(SPRITE_HAIR,
shoes,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_SHOES,
gloves,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_SHIELD,
cape,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_HEAD_TOP,
misc1,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_WEAPON,
bottomClothes,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_FLOOR,
shield,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
hat,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
topClothes,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_HEAD_MID,
misc2,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
character->slot = msg.readUInt8("slot");
const uint8_t sex = CAST_U8(msg.readUInt8("gender"));