From ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 8 Jun 2016 17:38:06 +0300 Subject: Remove default value from parameter isWeapon in Being->setSprite. --- src/net/eathena/charserverrecv.cpp | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) (limited to 'src/net/eathena/charserverrecv.cpp') 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) -- cgit v1.2.3-60-g2f50