From 025e9b12601079e7aeaaaa25225e9dadc376240a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 8 Jun 2016 17:51:01 +0300 Subject: Remove default value from parameter isItemSprite in Being->setSprite. --- src/actormanager.cpp | 13 ++++++--- src/being/being.cpp | 24 +++++++++++------ src/being/being.h | 2 +- src/gui/windows/charcreatedialog.cpp | 6 +++-- src/net/eathena/beinghandler.cpp | 45 ++++++++++++++++++++----------- src/net/eathena/beingrecv.cpp | 51 ++++++++++++++++++++++++------------ src/net/eathena/charserverrecv.cpp | 33 +++++++++++++++-------- src/net/tmwa/beinghandler.cpp | 15 +++++++---- src/net/tmwa/beingrecv.cpp | 39 ++++++++++++++++++--------- src/net/tmwa/charserverrecv.cpp | 36 ++++++++++++++++--------- 10 files changed, 177 insertions(+), 87 deletions(-) diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 28e51e6cd..c254839ca 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -2038,7 +2038,12 @@ Being *ActorManager::cloneBeing(const Being *const srcBeing, { const int spriteId = srcBeing->getSpriteID(slot); const ItemColor color = srcBeing->getSpriteColor(slot); - dstBeing->setSprite(slot, spriteId, "", color, IsWeapon_false); + dstBeing->setSprite(slot, + spriteId, + std::string(), + color, + IsWeapon_false, + IsTempSprite_false); } const int hairSlot = charServerHandler->hairSprite(); const int hairStyle = -srcBeing->getSpriteID(hairSlot); @@ -2049,7 +2054,8 @@ Being *ActorManager::cloneBeing(const Being *const srcBeing, hairStyle * -1, ItemDB::get(-hairStyle).getDyeColorsString(hairColor), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } else { @@ -2057,7 +2063,8 @@ Being *ActorManager::cloneBeing(const Being *const srcBeing, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } dstBeing->setHairColor(hairColor); return dstBeing; diff --git a/src/being/being.cpp b/src/being/being.cpp index 04b2463b4..d6d9f5f55 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -500,7 +500,8 @@ void Being::setSubtype(const BeingTypeId subtype, id, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } } else @@ -513,7 +514,8 @@ void Being::setSubtype(const BeingTypeId subtype, id, info.getColor(fromInt(mLook, ItemColor)), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } } } @@ -2616,7 +2618,8 @@ void Being::setSpriteID(const unsigned int slot, id, mSpriteColors[slot], ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } void Being::setSpriteColor(const unsigned int slot, @@ -2626,7 +2629,8 @@ void Being::setSpriteColor(const unsigned int slot, mSpriteIDs[slot], color, ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } void Being::setHairStyle(const unsigned int slot, @@ -2637,7 +2641,8 @@ void Being::setHairStyle(const unsigned int slot, id, ItemDB::get(id).getDyeColorsString(mHairColor), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); // dumpSprites(); } @@ -2652,7 +2657,8 @@ void Being::setHairColor(const unsigned int slot, mSpriteIDs[slot], ItemDB::get(id).getDyeColorsString(color), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } } @@ -2841,7 +2847,8 @@ void Being::setGender(const GenderT gender) restrict2 mSpriteIDs[i], mSpriteColors[i], ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } } @@ -3695,7 +3702,8 @@ void Being::undressItemById(const int id) restrict2 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); break; } } diff --git a/src/being/being.h b/src/being/being.h index 6d6929bca..ccda5966f 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -324,7 +324,7 @@ class Being notfinal : public ActorSprite, std::string color, ItemColor colorId, const IsWeapon isWeapon, - const IsTempSprite isTempSprite = IsTempSprite_false, + const IsTempSprite isTempSprite, const int *const cards = nullptr) restrict2; diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 00d8e13a0..f100afee9 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -160,7 +160,8 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, *it, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } if (!maxHairColor) @@ -773,7 +774,8 @@ void CharCreateDialog::updateHair() mHairStyle * -1, item.getDyeColorsString(fromInt(mHairColor, ItemColor)), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } void CharCreateDialog::updateRace() diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 19789f802..3274c56ee 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -54,77 +54,92 @@ void BeingHandler::undress(Being *const being) const 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_HEAD_BOTTOM, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_HEAD_TOP, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_HEAD_MID, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_CLOTHES_COLOR, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_SHIELD, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_FLOOR, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_ROBE, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_EVOL2, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_EVOL3, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_EVOL4, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_EVOL5, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_EVOL6, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_HAIR, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_SHOES, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } void BeingHandler::requestRanks(const RankT rank) const diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index ea84fe0d0..93fad8f4d 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -164,12 +164,14 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, "", itemColor, - IsWeapon_true); + IsWeapon_true, + IsTempSprite_false); dstBeing->setSprite(SPRITE_FLOOR, id2, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR); break; @@ -178,7 +180,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON); break; @@ -187,7 +190,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR); break; @@ -197,7 +201,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM); break; @@ -216,7 +221,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR); break; @@ -225,7 +231,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR); break; @@ -234,7 +241,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES); break; @@ -243,7 +251,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD); break; @@ -252,7 +261,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP); break; @@ -261,7 +271,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID); break; @@ -270,7 +281,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE); break; @@ -279,7 +291,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2); break; @@ -288,7 +301,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL3); break; @@ -297,7 +311,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL4); break; @@ -306,7 +321,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL5); break; @@ -315,7 +331,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL6); break; diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp index 67917cfd8..817d21da6 100644 --- a/src/net/eathena/charserverrecv.cpp +++ b/src/net/eathena/charserverrecv.cpp @@ -133,7 +133,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, weapon, "", ItemColor_one, - IsWeapon_true); + IsWeapon_true, + IsTempSprite_false); data.mAttributes[Attributes::LEVEL] = msg.readInt16("level"); @@ -151,7 +152,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } else { @@ -160,7 +162,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, ItemDB::get(-hairStyle).getDyeColorsString( color), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } const uint16_t look = msg.readInt16("clothes color"); @@ -193,42 +196,50 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, shoes, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_SHOES, gloves, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_SHIELD, cape, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_HEAD_TOP, misc1, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_FLOOR, shield, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); // tempPlayer->setSprite(SPRITE_HEAD_MID, misc2); } if (packetVersion >= 20110928) diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 59a34332b..a98db8a3a 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -53,27 +53,32 @@ void BeingHandler::undress(Being *const being) const 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_HEAD_BOTTOM, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_CLOTHES_COLOR, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_HAIR, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); being->setSprite(SPRITE_SHOES, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } #ifdef EATHENA_SUPPORT diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp index 167e0042f..9cc5090ac 100644 --- a/src/net/tmwa/beingrecv.cpp +++ b/src/net/tmwa/beingrecv.cpp @@ -147,12 +147,14 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, "", ItemColor_one, - IsWeapon_true); + IsWeapon_true, + IsTempSprite_false); dstBeing->setSprite(SPRITE_FLOOR, id2, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR); break; case 3: // Change lower headgear for eAthena, pants for us @@ -160,7 +162,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON); break; case 4: // Change upper headgear for eAthena, hat for us @@ -168,7 +171,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR); break; case 5: // Change middle headgear for eathena, armor for us @@ -176,7 +180,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM); break; case 6: // eAthena LOOK_HAIR_COLOR @@ -191,7 +196,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR); break; case 9: // eAthena LOOK_SHOES @@ -199,7 +205,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR); break; case 10: // LOOK_GLOVES @@ -207,7 +214,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES); break; case 11: // LOOK_CAPE @@ -215,7 +223,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD); break; case 12: @@ -223,7 +232,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP); break; case 13: @@ -231,7 +241,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID); break; case 14: @@ -239,7 +250,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE); break; case 15: @@ -247,7 +259,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2); break; case 16: diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp index 401585fc7..ba4088898 100644 --- a/src/net/tmwa/charserverrecv.cpp +++ b/src/net/tmwa/charserverrecv.cpp @@ -108,7 +108,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, weapon, "", ItemColor_one, - IsWeapon_true); + IsWeapon_true, + IsTempSprite_false); data.mAttributes[Attributes::LEVEL] = msg.readInt16("level"); @@ -128,7 +129,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, 0, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } else { @@ -136,7 +138,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, hairStyle * -1, ItemDB::get(-hairStyle).getDyeColorsString(hairColor), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); } tempPlayer->setHairColor(hairColor); @@ -156,47 +159,56 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, shoes, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_SHOES, gloves, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_SHIELD, cape, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_HEAD_TOP, misc1, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_FLOOR, shield, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); tempPlayer->setSprite(SPRITE_HEAD_MID, misc2, std::string(), ItemColor_one, - IsWeapon_false); + IsWeapon_false, + IsTempSprite_false); character->slot = msg.readUInt8("slot"); const uint8_t sex = CAST_U8(msg.readUInt8("gender")); -- cgit v1.2.3-60-g2f50