diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-06-08 17:22:18 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-06-08 17:22:18 +0300 |
commit | 8cdbcd738db5477a72b8c7b11c4b0f160f5ac2b6 (patch) | |
tree | 04b3a9384dd92db372953bfbfcabec53d368fb41 /src/net/eathena/charserverrecv.cpp | |
parent | 326318d644c91f785e98a5b36fe350a95fdd5760 (diff) | |
download | plus-8cdbcd738db5477a72b8c7b11c4b0f160f5ac2b6.tar.gz plus-8cdbcd738db5477a72b8c7b11c4b0f160f5ac2b6.tar.bz2 plus-8cdbcd738db5477a72b8c7b11c4b0f160f5ac2b6.tar.xz plus-8cdbcd738db5477a72b8c7b11c4b0f160f5ac2b6.zip |
Remove default value from parameter colorId in Being->setSprite.
Diffstat (limited to 'src/net/eathena/charserverrecv.cpp')
-rw-r--r-- | src/net/eathena/charserverrecv.cpp | 48 |
1 files changed, 37 insertions, 11 deletions
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp index 0b3e5b82d..e10339b40 100644 --- a/src/net/eathena/charserverrecv.cpp +++ b/src/net/eathena/charserverrecv.cpp @@ -147,13 +147,15 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, tempPlayer->setHairColor(color); if (hairStyle == 0) { - tempPlayer->setSprite(SPRITE_HAIR_COLOR, 0, std::string()); + tempPlayer->setSprite(SPRITE_HAIR_COLOR, 0, std::string(), ItemColor_one); } else { - tempPlayer->setSprite(SPRITE_HAIR_COLOR, hairStyle * -1, + tempPlayer->setSprite(SPRITE_HAIR_COLOR, + hairStyle * -1, ItemDB::get(-hairStyle).getDyeColorsString( - color)); + color), + ItemColor_one); } const uint16_t look = msg.readInt16("clothes color"); @@ -182,14 +184,38 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, shoes = msg.readInt32("robe"); if (!serverFeatures->haveAdvancedSprites()) { - 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_HAIR, + shoes, + std::string(), + ItemColor_one); + tempPlayer->setSprite(SPRITE_SHOES, + gloves, + std::string(), + ItemColor_one); + tempPlayer->setSprite(SPRITE_SHIELD, + cape, + std::string(), + ItemColor_one); + tempPlayer->setSprite(SPRITE_HEAD_TOP, + misc1, + std::string(), + ItemColor_one); + tempPlayer->setSprite(SPRITE_WEAPON, + bottomClothes, + std::string(), + ItemColor_one); + tempPlayer->setSprite(SPRITE_FLOOR, + shield, + std::string(), + ItemColor_one); + tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, + hat, + std::string(), + ItemColor_one); + tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, + topClothes, + std::string(), + ItemColor_one); // tempPlayer->setSprite(SPRITE_HEAD_MID, misc2); } if (packetVersion >= 20110928) |