diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-06-08 17:51:01 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-06-08 17:51:01 +0300 |
commit | 025e9b12601079e7aeaaaa25225e9dadc376240a (patch) | |
tree | ce9136fc783f355046a7a044c2c7d2a7b0cc199a /src/net/tmwa | |
parent | ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7 (diff) | |
download | manaverse-025e9b12601079e7aeaaaa25225e9dadc376240a.tar.gz manaverse-025e9b12601079e7aeaaaa25225e9dadc376240a.tar.bz2 manaverse-025e9b12601079e7aeaaaa25225e9dadc376240a.tar.xz manaverse-025e9b12601079e7aeaaaa25225e9dadc376240a.zip |
Remove default value from parameter isItemSprite in Being->setSprite.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r-- | src/net/tmwa/beinghandler.cpp | 15 | ||||
-rw-r--r-- | src/net/tmwa/beingrecv.cpp | 39 | ||||
-rw-r--r-- | src/net/tmwa/charserverrecv.cpp | 36 |
3 files changed, 60 insertions, 30 deletions
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")); |