summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-09-08 21:39:21 +0300
committerAndrei Karas <akaras@inbox.ru>2015-09-08 21:39:21 +0300
commitf39df8b1de96c6d6e78d90f2f058318aa7fd998b (patch)
tree1d3a5ba6fa16584f2a3cdb64cc18f720f20e8f09 /src
parent00cc703c86c6c0118cb2c1d976886710aa61d91d (diff)
downloadmanaplus-f39df8b1de96c6d6e78d90f2f058318aa7fd998b.tar.gz
manaplus-f39df8b1de96c6d6e78d90f2f058318aa7fd998b.tar.bz2
manaplus-f39df8b1de96c6d6e78d90f2f058318aa7fd998b.tar.xz
manaplus-f39df8b1de96c6d6e78d90f2f058318aa7fd998b.zip
Add some missing item colors.
Diffstat (limited to 'src')
-rw-r--r--src/actions/commands.cpp1
-rw-r--r--src/gui/windows/buyingstoreselldialog.cpp4
-rw-r--r--src/gui/windows/shopwindow.cpp4
-rw-r--r--src/net/eathena/petrecv.cpp1
4 files changed, 3 insertions, 7 deletions
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)