summaryrefslogtreecommitdiff
path: root/src/net/eathena/charserverrecv.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-08 17:38:06 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-08 17:38:06 +0300
commitca23f86b2b1ae730d0511bb1613e5f4b7211c8d7 (patch)
tree729fbb5786bdf41ae8004e1850248ca2e890974c /src/net/eathena/charserverrecv.cpp
parent8cdbcd738db5477a72b8c7b11c4b0f160f5ac2b6 (diff)
downloadplus-ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7.tar.gz
plus-ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7.tar.bz2
plus-ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7.tar.xz
plus-ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7.zip
Remove default value from parameter isWeapon in Being->setSprite.
Diffstat (limited to 'src/net/eathena/charserverrecv.cpp')
-rw-r--r--src/net/eathena/charserverrecv.cpp33
1 files changed, 23 insertions, 10 deletions
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index e10339b40..67917cfd8 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -147,7 +147,11 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
tempPlayer->setHairColor(color);
if (hairStyle == 0)
{
- tempPlayer->setSprite(SPRITE_HAIR_COLOR, 0, std::string(), ItemColor_one);
+ tempPlayer->setSprite(SPRITE_HAIR_COLOR,
+ 0,
+ std::string(),
+ ItemColor_one,
+ IsWeapon_false);
}
else
{
@@ -155,7 +159,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
hairStyle * -1,
ItemDB::get(-hairStyle).getDyeColorsString(
color),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
}
const uint16_t look = msg.readInt16("clothes color");
@@ -187,35 +192,43 @@ 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);
}
if (packetVersion >= 20110928)