summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-08 18:26:56 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-08 18:55:05 +0300
commit53ccb4e767914782172c09ead9076f9fccaa5253 (patch)
tree2bcf886b7c0b25c4a757892148fcd5c3778403ea /src/net
parente03f294796e1cd8d49d00fd86dc33959948924c7 (diff)
downloadmanaplus-53ccb4e767914782172c09ead9076f9fccaa5253.tar.gz
manaplus-53ccb4e767914782172c09ead9076f9fccaa5253.tar.bz2
manaplus-53ccb4e767914782172c09ead9076f9fccaa5253.tar.xz
manaplus-53ccb4e767914782172c09ead9076f9fccaa5253.zip
Add setTempSprite method into Being.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/beingrecv.cpp5
-rw-r--r--src/net/ea/beingrecv.h3
-rw-r--r--src/net/eathena/beinghandler.cpp15
-rw-r--r--src/net/eathena/beingrecv.cpp17
-rw-r--r--src/net/eathena/charserverrecv.cpp11
-rw-r--r--src/net/tmwa/beinghandler.cpp5
-rw-r--r--src/net/tmwa/beingrecv.cpp13
-rw-r--r--src/net/tmwa/charserverrecv.cpp12
8 files changed, 3 insertions, 78 deletions
diff --git a/src/net/ea/beingrecv.cpp b/src/net/ea/beingrecv.cpp
index c37cf2f82..06739043b 100644
--- a/src/net/ea/beingrecv.cpp
+++ b/src/net/ea/beingrecv.cpp
@@ -547,12 +547,11 @@ void BeingRecv::setSprite(Being *const being,
const int id,
const std::string &color,
const ItemColor colorId,
- const IsWeapon isWeapon,
- const IsTempSprite isTempSprite)
+ const IsWeapon isWeapon)
{
if (!being)
return;
- being->updateSprite(slot, id, color, colorId, isWeapon, isTempSprite);
+ being->updateSprite(slot, id, color, colorId, isWeapon);
}
} // namespace Ea
diff --git a/src/net/ea/beingrecv.h b/src/net/ea/beingrecv.h
index 200059327..0da890eb3 100644
--- a/src/net/ea/beingrecv.h
+++ b/src/net/ea/beingrecv.h
@@ -60,8 +60,7 @@ namespace Ea
const int id,
const std::string &color = "",
const ItemColor colorId = ItemColor_one,
- const IsWeapon isWeapon = IsWeapon_false,
- const IsTempSprite isTempSprite = IsTempSprite_false);
+ const IsWeapon isWeapon = IsWeapon_false);
} // namespace BeingRecv
} // namespace Ea
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 8ad438a09..c4b8e85d5 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -55,105 +55,90 @@ void BeingHandler::undress(Being *const being) const
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_HEAD_BOTTOM,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_HEAD_TOP,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_HEAD_MID,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_CLOTHES_COLOR,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_SHIELD,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_FLOOR,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_ROBE,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_EVOL2,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_EVOL3,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_EVOL4,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_EVOL5,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_EVOL6,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_HAIR,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_SHOES,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 0c673be9f..1664cd77a 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -165,14 +165,12 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
"",
itemColor,
IsWeapon_true,
- IsTempSprite_false,
cards);
dstBeing->setSprite(SPRITE_FLOOR,
id2,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
@@ -183,7 +181,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
@@ -194,7 +191,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
@@ -206,7 +202,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
@@ -227,7 +222,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
@@ -238,7 +232,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
@@ -249,7 +242,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
@@ -260,7 +252,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
@@ -271,7 +262,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
@@ -282,7 +272,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
@@ -293,7 +282,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
@@ -304,7 +292,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
@@ -315,7 +302,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL3);
@@ -326,7 +312,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL4);
@@ -337,7 +322,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL5);
@@ -348,7 +332,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
itemColor,
IsWeapon_false,
- IsTempSprite_false,
cards);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL6);
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index 4add9c820..7c8a2d99f 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -134,7 +134,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
"",
ItemColor_one,
IsWeapon_true,
- IsTempSprite_false,
nullptr);
data.mAttributes[Attributes::LEVEL] = msg.readInt16("level");
@@ -154,7 +153,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
else
@@ -165,7 +163,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
color),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
@@ -200,56 +197,48 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_SHOES,
gloves,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_SHIELD,
cape,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_HEAD_TOP,
misc1,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_WEAPON,
bottomClothes,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_FLOOR,
shield,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
hat,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
topClothes,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
// tempPlayer->setSprite(SPRITE_HEAD_MID, misc2);
}
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index ec8aee8ef..c479e4ced 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -54,35 +54,30 @@ void BeingHandler::undress(Being *const being) const
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_HEAD_BOTTOM,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_CLOTHES_COLOR,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_HAIR,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
being->setSprite(SPRITE_SHOES,
0,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 57b295a8d..98f030f12 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -148,14 +148,12 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
"",
ItemColor_one,
IsWeapon_true,
- IsTempSprite_false,
nullptr);
dstBeing->setSprite(SPRITE_FLOOR,
id2,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
@@ -165,7 +163,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
break;
@@ -175,7 +172,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
break;
@@ -185,7 +181,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
break;
@@ -202,7 +197,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
@@ -212,7 +206,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
break;
@@ -222,7 +215,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
break;
@@ -232,7 +224,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
break;
@@ -242,7 +233,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
break;
@@ -252,7 +242,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
break;
@@ -262,7 +251,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
break;
@@ -272,7 +260,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
color,
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
break;
diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp
index 15c8aa7a0..a940799ba 100644
--- a/src/net/tmwa/charserverrecv.cpp
+++ b/src/net/tmwa/charserverrecv.cpp
@@ -109,7 +109,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
"",
ItemColor_one,
IsWeapon_true,
- IsTempSprite_false,
nullptr);
data.mAttributes[Attributes::LEVEL] = msg.readInt16("level");
@@ -131,7 +130,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
else
@@ -141,7 +139,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
ItemDB::get(-hairStyle).getDyeColorsString(hairColor),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
}
tempPlayer->setHairColor(hairColor);
@@ -163,63 +160,54 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_SHOES,
gloves,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_SHIELD,
cape,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_HEAD_TOP,
misc1,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_WEAPON,
bottomClothes,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_FLOOR,
shield,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
hat,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
topClothes,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
tempPlayer->setSprite(SPRITE_HEAD_MID,
misc2,
std::string(),
ItemColor_one,
IsWeapon_false,
- IsTempSprite_false,
nullptr);
character->slot = msg.readUInt8("slot");
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-01 01:11:01 +0000