From 0cf09f63f5c626738f2dfdec82da876723b0db89 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 20 Jun 2016 19:49:01 +0300 Subject: Add explicit keyword into CardsList. --- src/net/tmwa/beinghandler.cpp | 10 +++++----- src/net/tmwa/beingrecv.cpp | 26 +++++++++++++------------- src/net/tmwa/charserverrecv.cpp | 24 ++++++++++++------------ 3 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src/net/tmwa') diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 8aa01bb9c..9a67b9358 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -53,27 +53,27 @@ void BeingHandler::undress(Being *const being) const 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_HEAD_BOTTOM, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_CLOTHES_COLOR, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_HAIR, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_SHOES, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); } #ifdef EATHENA_SUPPORT diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp index 73fa7b87c..16c2f1599 100644 --- a/src/net/tmwa/beingrecv.cpp +++ b/src/net/tmwa/beingrecv.cpp @@ -147,13 +147,13 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, "", ItemColor_one, - nullptr); + zeroCards); dstBeing->setWeaponId(id); dstBeing->setSprite(SPRITE_FLOOR, id2, std::string(), ItemColor_one, - nullptr); + zeroCards); localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR); break; case 3: // Change lower headgear for eAthena, pants for us @@ -161,7 +161,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - nullptr); + zeroCards); localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON); break; case 4: // Change upper headgear for eAthena, hat for us @@ -169,7 +169,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - nullptr); + zeroCards); localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR); break; case 5: // Change middle headgear for eathena, armor for us @@ -177,7 +177,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - nullptr); + zeroCards); localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM); break; case 6: // eAthena LOOK_HAIR_COLOR @@ -192,7 +192,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - nullptr); + zeroCards); localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR); break; case 9: // eAthena LOOK_SHOES @@ -200,7 +200,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - nullptr); + zeroCards); localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR); break; case 10: // LOOK_GLOVES @@ -208,7 +208,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - nullptr); + zeroCards); localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES); break; case 11: // LOOK_CAPE @@ -216,7 +216,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - nullptr); + zeroCards); localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD); break; case 12: @@ -224,7 +224,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - nullptr); + zeroCards); localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP); break; case 13: @@ -232,7 +232,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - nullptr); + zeroCards); localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID); break; case 14: @@ -240,7 +240,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - nullptr); + zeroCards); localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE); break; case 15: @@ -248,7 +248,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, ItemColor_one, - nullptr); + zeroCards); localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2); break; case 16: diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp index 7a5c6adae..2fd768870 100644 --- a/src/net/tmwa/charserverrecv.cpp +++ b/src/net/tmwa/charserverrecv.cpp @@ -108,7 +108,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, weapon, "", ItemColor_one, - nullptr); + zeroCards); tempPlayer->setWeaponId(weapon); data.mAttributes[Attributes::LEVEL] = msg.readInt16("level"); @@ -129,7 +129,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); } else { @@ -137,7 +137,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, hairStyle * -1, ItemDB::get(-hairStyle).getDyeColorsString(hairColor), ItemColor_one, - nullptr); + zeroCards); } tempPlayer->setHairColor(hairColor); @@ -157,47 +157,47 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, shoes, std::string(), ItemColor_one, - nullptr); + zeroCards); tempPlayer->setSprite(SPRITE_SHOES, gloves, std::string(), ItemColor_one, - nullptr); + zeroCards); tempPlayer->setSprite(SPRITE_SHIELD, cape, std::string(), ItemColor_one, - nullptr); + zeroCards); tempPlayer->setSprite(SPRITE_HEAD_TOP, misc1, std::string(), ItemColor_one, - nullptr); + zeroCards); tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes, std::string(), ItemColor_one, - nullptr); + zeroCards); tempPlayer->setSprite(SPRITE_FLOOR, shield, std::string(), ItemColor_one, - nullptr); + zeroCards); tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat, std::string(), ItemColor_one, - nullptr); + zeroCards); tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes, std::string(), ItemColor_one, - nullptr); + zeroCards); tempPlayer->setSprite(SPRITE_HEAD_MID, misc2, std::string(), ItemColor_one, - nullptr); + zeroCards); character->slot = msg.readUInt8("slot"); const uint8_t sex = CAST_U8(msg.readUInt8("gender")); -- cgit v1.2.3-70-g09d2