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/tmwa/beinghandler.cpp | 10 +++++----- src/net/tmwa/beingrecv.cpp | 2 +- src/net/tmwa/charserverrecv.cpp | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/net/tmwa') diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 777dbf706..6a3e8a854 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -49,11 +49,11 @@ void BeingHandler::undress(Being *const being) const { if (!being) return; - being->setSprite(SPRITE_WEAPON, 0); - being->setSprite(SPRITE_HEAD_BOTTOM, 0); - being->setSprite(SPRITE_CLOTHES_COLOR, 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_CLOTHES_COLOR, 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/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp index 5eec60985..31b9bfdd0 100644 --- a/src/net/tmwa/beingrecv.cpp +++ b/src/net/tmwa/beingrecv.cpp @@ -148,7 +148,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, "", ItemColor_one, IsWeapon_true); - dstBeing->setSprite(SPRITE_FLOOR, id2); + dstBeing->setSprite(SPRITE_FLOOR, id2, std::string()); localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR); break; case 3: // Change lower headgear for eAthena, pants for us diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp index 18c0ab791..c599f17af 100644 --- a/src/net/tmwa/charserverrecv.cpp +++ b/src/net/tmwa/charserverrecv.cpp @@ -148,15 +148,15 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, character->data.mStats[Attributes::DEX].base = msg.readUInt8("dex"); character->data.mStats[Attributes::LUK].base = msg.readUInt8("luk"); - 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); // head option top - tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes); - tempPlayer->setSprite(SPRITE_HEAD_MID, misc2); + 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, std::string()); character->slot = msg.readUInt8("slot"); const uint8_t sex = CAST_U8(msg.readUInt8("gender")); -- cgit v1.2.3-70-g09d2