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/tmwa/charserverrecv.cpp | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'src/net/tmwa/charserverrecv.cpp') 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")); -- cgit v1.2.3-70-g09d2