summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/beinghandler.cpp5
-rw-r--r--src/net/tmwa/beingrecv.cpp28
-rw-r--r--src/net/tmwa/charserverrecv.cpp12
3 files changed, 5 insertions, 40 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index c479e4ced..8aa01bb9c 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -53,31 +53,26 @@ void BeingHandler::undress(Being *const being) const
0,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
being->setSprite(SPRITE_HEAD_BOTTOM,
0,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
being->setSprite(SPRITE_CLOTHES_COLOR,
0,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
being->setSprite(SPRITE_HAIR,
0,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
being->setSprite(SPRITE_SHOES,
0,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
}
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index a219203cc..73fa7b87c 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -147,14 +147,12 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
id,
"",
ItemColor_one,
- IsWeapon_true,
nullptr);
dstBeing->setWeaponId(id);
dstBeing->setSprite(SPRITE_FLOOR,
id2,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
@@ -163,7 +161,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
id,
color,
ItemColor_one,
- IsWeapon_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
break;
@@ -172,7 +169,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
id,
color,
ItemColor_one,
- IsWeapon_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
break;
@@ -181,7 +177,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
id,
color,
ItemColor_one,
- IsWeapon_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
break;
@@ -197,7 +192,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
id,
color,
ItemColor_one,
- IsWeapon_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
@@ -206,7 +200,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
id,
color,
ItemColor_one,
- IsWeapon_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
break;
@@ -215,7 +208,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
id,
color,
ItemColor_one,
- IsWeapon_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
break;
@@ -224,7 +216,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
id,
color,
ItemColor_one,
- IsWeapon_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
break;
@@ -233,7 +224,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
id,
color,
ItemColor_one,
- IsWeapon_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
break;
@@ -242,7 +232,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
id,
color,
ItemColor_one,
- IsWeapon_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
break;
@@ -251,7 +240,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
id,
color,
ItemColor_one,
- IsWeapon_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
break;
@@ -260,7 +248,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
id,
color,
ItemColor_one,
- IsWeapon_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
break;
@@ -369,8 +356,7 @@ void BeingRecv::processPlayerUpdate1(Net::MessageIn &msg)
dstBeing->updateSprite(SPRITE_BODY,
weapon,
"",
- ItemColor_one,
- IsWeapon_true);
+ ItemColor_one);
dstBeing->setWeaponId(weapon);
dstBeing->updateSprite(SPRITE_FLOOR, shield);
dstBeing->updateSprite(SPRITE_WEAPON, headBottom);
@@ -516,8 +502,7 @@ void BeingRecv::processPlayerUpdate2(Net::MessageIn &msg)
dstBeing->updateSprite(SPRITE_BODY,
weapon,
"",
- ItemColor_one,
- IsWeapon_true);
+ ItemColor_one);
dstBeing->setWeaponId(weapon);
dstBeing->updateSprite(SPRITE_FLOOR, shield);
dstBeing->updateSprite(SPRITE_WEAPON, headBottom);
@@ -663,8 +648,7 @@ void BeingRecv::processPlayerMove(Net::MessageIn &msg)
dstBeing->updateSprite(SPRITE_BODY,
weapon,
"",
- ItemColor_one,
- IsWeapon_true);
+ ItemColor_one);
dstBeing->setWeaponId(weapon);
dstBeing->updateSprite(SPRITE_FLOOR, shield);
dstBeing->updateSprite(SPRITE_WEAPON, headBottom);
@@ -918,8 +902,7 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
SPRITE_BODY,
weapon,
"",
- ItemColor_one,
- IsWeapon_true);
+ ItemColor_one);
dstBeing->setWeaponId(weapon);
Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield);
}
@@ -1136,8 +1119,7 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
SPRITE_BODY,
weapon,
"",
- ItemColor_one,
- IsWeapon_true);
+ ItemColor_one);
dstBeing->setWeaponId(weapon);
Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield);
}
diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp
index fdc24cf7a..7a5c6adae 100644
--- a/src/net/tmwa/charserverrecv.cpp
+++ b/src/net/tmwa/charserverrecv.cpp
@@ -108,7 +108,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
weapon,
"",
ItemColor_one,
- IsWeapon_true,
nullptr);
tempPlayer->setWeaponId(weapon);
@@ -130,7 +129,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
0,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
}
else
@@ -139,7 +137,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
hairStyle * -1,
ItemDB::get(-hairStyle).getDyeColorsString(hairColor),
ItemColor_one,
- IsWeapon_false,
nullptr);
}
tempPlayer->setHairColor(hairColor);
@@ -160,55 +157,46 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
shoes,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
tempPlayer->setSprite(SPRITE_SHOES,
gloves,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
tempPlayer->setSprite(SPRITE_SHIELD,
cape,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
tempPlayer->setSprite(SPRITE_HEAD_TOP,
misc1,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
tempPlayer->setSprite(SPRITE_WEAPON,
bottomClothes,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
tempPlayer->setSprite(SPRITE_FLOOR,
shield,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
hat,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
topClothes,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
tempPlayer->setSprite(SPRITE_HEAD_MID,
misc2,
std::string(),
ItemColor_one,
- IsWeapon_false,
nullptr);
character->slot = msg.readUInt8("slot");
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-12 23:40:59 +0000