From 326318d644c91f785e98a5b36fe350a95fdd5760 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 8 Jun 2016 16:44:29 +0300 Subject: Remove default value from parameter color in Being->setSprite. --- src/net/eathena/beinghandler.cpp | 30 +++++++++++++++--------------- src/net/eathena/beingrecv.cpp | 2 +- src/net/eathena/charserverrecv.cpp | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/net/eathena') diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 39a4460b6..f3de8d925 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -50,21 +50,21 @@ void BeingHandler::undress(Being *const being) const { if (!being) return; - being->setSprite(SPRITE_WEAPON, 0); - being->setSprite(SPRITE_HEAD_BOTTOM, 0); - being->setSprite(SPRITE_HEAD_TOP, 0); - being->setSprite(SPRITE_HEAD_MID, 0); - being->setSprite(SPRITE_CLOTHES_COLOR, 0); - being->setSprite(SPRITE_SHIELD, 0); - being->setSprite(SPRITE_FLOOR, 0); - being->setSprite(SPRITE_ROBE, 0); - being->setSprite(SPRITE_EVOL2, 0); - being->setSprite(SPRITE_EVOL3, 0); - being->setSprite(SPRITE_EVOL4, 0); - being->setSprite(SPRITE_EVOL5, 0); - being->setSprite(SPRITE_EVOL6, 0); - being->setSprite(SPRITE_HAIR, 0); - being->setSprite(SPRITE_SHOES, 0); + being->setSprite(SPRITE_WEAPON, 0, std::string()); + being->setSprite(SPRITE_HEAD_BOTTOM, 0, std::string()); + being->setSprite(SPRITE_HEAD_TOP, 0, std::string()); + being->setSprite(SPRITE_HEAD_MID, 0, std::string()); + being->setSprite(SPRITE_CLOTHES_COLOR, 0, std::string()); + being->setSprite(SPRITE_SHIELD, 0, std::string()); + being->setSprite(SPRITE_FLOOR, 0, std::string()); + being->setSprite(SPRITE_ROBE, 0, std::string()); + being->setSprite(SPRITE_EVOL2, 0, std::string()); + being->setSprite(SPRITE_EVOL3, 0, std::string()); + being->setSprite(SPRITE_EVOL4, 0, std::string()); + being->setSprite(SPRITE_EVOL5, 0, std::string()); + being->setSprite(SPRITE_EVOL6, 0, std::string()); + being->setSprite(SPRITE_HAIR, 0, std::string()); + being->setSprite(SPRITE_SHOES, 0, std::string()); // being->setSprite(SPRITE_BODY, 0, "", true); } diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index 07779147a..ee31c236d 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -165,7 +165,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, "", itemColor, IsWeapon_true); - dstBeing->setSprite(SPRITE_FLOOR, id2); + dstBeing->setSprite(SPRITE_FLOOR, id2, std::string()); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR); break; diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp index 598602355..0b3e5b82d 100644 --- a/src/net/eathena/charserverrecv.cpp +++ b/src/net/eathena/charserverrecv.cpp @@ -182,14 +182,14 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, shoes = msg.readInt32("robe"); if (!serverFeatures->haveAdvancedSprites()) { - tempPlayer->setSprite(SPRITE_HAIR, shoes); - tempPlayer->setSprite(SPRITE_SHOES, gloves); - tempPlayer->setSprite(SPRITE_SHIELD, cape); - tempPlayer->setSprite(SPRITE_HEAD_TOP, misc1); - tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes); - tempPlayer->setSprite(SPRITE_FLOOR, shield); - tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat); - tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes); + tempPlayer->setSprite(SPRITE_HAIR, shoes, std::string()); + tempPlayer->setSprite(SPRITE_SHOES, gloves, std::string()); + tempPlayer->setSprite(SPRITE_SHIELD, cape, std::string()); + tempPlayer->setSprite(SPRITE_HEAD_TOP, misc1, std::string()); + tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes, std::string()); + tempPlayer->setSprite(SPRITE_FLOOR, shield, std::string()); + tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat, std::string()); + tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes, std::string()); // tempPlayer->setSprite(SPRITE_HEAD_MID, misc2); } if (packetVersion >= 20110928) -- cgit v1.2.3-70-g09d2