diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-06-20 19:49:01 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-06-20 19:49:01 +0300 |
commit | 0cf09f63f5c626738f2dfdec82da876723b0db89 (patch) | |
tree | b6b9d22c0b4cc2f51957355271eedbc26fd42aee | |
parent | 682ae29f4861c1434db7f5f885cd5062d73b0d1a (diff) | |
download | mv-0cf09f63f5c626738f2dfdec82da876723b0db89.tar.gz mv-0cf09f63f5c626738f2dfdec82da876723b0db89.tar.bz2 mv-0cf09f63f5c626738f2dfdec82da876723b0db89.tar.xz mv-0cf09f63f5c626738f2dfdec82da876723b0db89.zip |
Add explicit keyword into CardsList.
-rw-r--r-- | src/actormanager.cpp | 6 | ||||
-rw-r--r-- | src/being/being.cpp | 4 | ||||
-rw-r--r-- | src/gui/windows/charcreatedialog.cpp | 4 | ||||
-rw-r--r-- | src/net/eathena/beinghandler.cpp | 30 | ||||
-rw-r--r-- | src/net/eathena/beingrecv.cpp | 34 | ||||
-rw-r--r-- | src/net/eathena/charserverrecv.cpp | 22 | ||||
-rw-r--r-- | src/net/tmwa/beinghandler.cpp | 10 | ||||
-rw-r--r-- | src/net/tmwa/beingrecv.cpp | 26 | ||||
-rw-r--r-- | src/net/tmwa/charserverrecv.cpp | 24 | ||||
-rw-r--r-- | src/resources/item/cardslist.h | 2 |
10 files changed, 81 insertions, 81 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 492922f85..1d4416482 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -2042,7 +2042,7 @@ Being *ActorManager::cloneBeing(const Being *const srcBeing, spriteId, std::string(), color, - nullptr); + zeroCards); } const int hairSlot = charServerHandler->hairSprite(); const int hairStyle = -srcBeing->getSpriteID(hairSlot); @@ -2053,7 +2053,7 @@ Being *ActorManager::cloneBeing(const Being *const srcBeing, hairStyle * -1, ItemDB::get(-hairStyle).getDyeColorsString(hairColor), ItemColor_one, - nullptr); + zeroCards); } else { @@ -2061,7 +2061,7 @@ Being *ActorManager::cloneBeing(const Being *const srcBeing, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); } dstBeing->setHairColor(hairColor); return dstBeing; diff --git a/src/being/being.cpp b/src/being/being.cpp index 66b01acb3..ae5137fb2 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -501,7 +501,7 @@ void Being::setSubtype(const BeingTypeId subtype, id, std::string(), ItemColor_one, - nullptr); + zeroCards); } } else @@ -514,7 +514,7 @@ void Being::setSubtype(const BeingTypeId subtype, id, info.getColor(fromInt(mLook, ItemColor)), ItemColor_one, - nullptr); + zeroCards); } } } diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 529d89ae5..bf0352a17 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -160,7 +160,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, *it, std::string(), ItemColor_one, - nullptr); + zeroCards); } if (!maxHairColor) @@ -773,7 +773,7 @@ void CharCreateDialog::updateHair() mHairStyle * -1, item.getDyeColorsString(fromInt(mHairColor, ItemColor)), ItemColor_one, - nullptr); + zeroCards); } void CharCreateDialog::updateRace() diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index f1f47ca61..49e96501e 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -54,77 +54,77 @@ 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_HEAD_TOP, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_HEAD_MID, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_CLOTHES_COLOR, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_SHIELD, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_FLOOR, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_ROBE, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_EVOL2, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_EVOL3, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_EVOL4, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_EVOL5, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); being->setSprite(SPRITE_EVOL6, 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); } void BeingHandler::requestRanks(const RankT rank) const diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index 83c6b9515..4a05c44dc 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -164,13 +164,13 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, "", itemColor, - cards); + CardsList(cards)); dstBeing->setWeaponId(id); dstBeing->setSprite(SPRITE_FLOOR, id2, std::string(), ItemColor_one, - nullptr); + zeroCards); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR); break; @@ -179,7 +179,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON); break; @@ -188,7 +188,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR); break; @@ -198,7 +198,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM); break; @@ -217,7 +217,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR); break; @@ -226,7 +226,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR); break; @@ -235,7 +235,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES); break; @@ -244,7 +244,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD); break; @@ -253,7 +253,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP); break; @@ -262,7 +262,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID); break; @@ -271,7 +271,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE); break; @@ -280,7 +280,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2); break; @@ -289,7 +289,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL3); break; @@ -298,7 +298,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL4); break; @@ -307,7 +307,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL5); break; @@ -316,7 +316,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, id, color, itemColor, - cards); + CardsList(cards)); if (localPlayer) localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL6); break; diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp index d3300f092..8b9de16a9 100644 --- a/src/net/eathena/charserverrecv.cpp +++ b/src/net/eathena/charserverrecv.cpp @@ -133,7 +133,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, weapon, "", ItemColor_one, - nullptr); + zeroCards); tempPlayer->setWeaponId(weapon); data.mAttributes[Attributes::LEVEL] = msg.readInt16("level"); @@ -152,7 +152,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, 0, std::string(), ItemColor_one, - nullptr); + zeroCards); } else { @@ -161,7 +161,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, ItemDB::get(-hairStyle).getDyeColorsString( color), ItemColor_one, - nullptr); + zeroCards); } const uint16_t look = msg.readInt16("clothes color"); @@ -194,42 +194,42 @@ 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); } if (packetVersion >= 20110928) 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")); diff --git a/src/resources/item/cardslist.h b/src/resources/item/cardslist.h index 8da565091..e37b3a02d 100644 --- a/src/resources/item/cardslist.h +++ b/src/resources/item/cardslist.h @@ -40,7 +40,7 @@ struct CardsList final cards[3] = card3; } - CardsList(const int *const cards0) + explicit CardsList(const int *const cards0) { if (cards0) { |