From f39df8b1de96c6d6e78d90f2f058318aa7fd998b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 8 Sep 2015 21:39:21 +0300 Subject: Add some missing item colors. --- src/actions/commands.cpp | 1 - src/gui/windows/buyingstoreselldialog.cpp | 4 ++-- src/gui/windows/shopwindow.cpp | 4 +--- src/net/eathena/petrecv.cpp | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index ed017a74c..a3238e81c 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -519,7 +519,6 @@ impHandler(imitation) impHandler0(sendMail) { - // +++ need impliment for hercules const ServerTypeT type = Net::getNetworkType(); #ifdef EATHENA_SUPPORT if (type == ServerType::EATHENA || type == ServerType::EVOL2) diff --git a/src/gui/windows/buyingstoreselldialog.cpp b/src/gui/windows/buyingstoreselldialog.cpp index 637bdc5bd..9de82994d 100644 --- a/src/gui/windows/buyingstoreselldialog.cpp +++ b/src/gui/windows/buyingstoreselldialog.cpp @@ -56,9 +56,9 @@ void BuyingStoreSellDialog::sellAction(const ActionEvent &event A_UNUSED) Being *const being = actorManager->findBeing(mAccountId); if (!being) return; - // +++ need add colors Item *const item2 = PlayerInfo::getInventory()->findItem( - item1->getId(), ItemColor_one); + item1->getId(), + item1->getColor()); if (!item2) return; diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index c5014f902..645ae5314 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -347,9 +347,8 @@ void ShopWindow::action(const ActionEvent &event) ShopItem *const item = *it; if (!item) continue; - // +++ need add colors Item *const cartItem = inv->findItem(item->getId(), - ItemColor_one); + item->getColor()); if (!cartItem) continue; item->setInvIndex(cartItem->getInvIndex()); @@ -748,7 +747,6 @@ void ShopWindow::giveList(const std::string &nick, const int mode) if (mode == SELL) { - // +++ need support for colors const Item *const item2 = inv->findItem(item->getId(), ItemColor_zero); if (item2) diff --git a/src/net/eathena/petrecv.cpp b/src/net/eathena/petrecv.cpp index c22323480..a801b2a3a 100644 --- a/src/net/eathena/petrecv.cpp +++ b/src/net/eathena/petrecv.cpp @@ -185,7 +185,6 @@ void PetRecv::processPetStatus(Net::MessageIn &msg) void PetRecv::processPetFood(Net::MessageIn &msg) { - // +++ need show notification message about success or fail const int result = msg.readUInt8("result"); msg.readInt16("food id"); if (result) -- cgit v1.2.3-60-g2f50