From 3874b588e2a9d70eb678c8a33785a575b16fa7b2 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 25 Aug 2017 00:21:24 +0300
Subject: Fix error messages about adding item to mail.

---
 src/net/eathena/mail2recv.cpp | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

(limited to 'src/net')

diff --git a/src/net/eathena/mail2recv.cpp b/src/net/eathena/mail2recv.cpp
index ee9c6b6da..bb0403681 100644
--- a/src/net/eathena/mail2recv.cpp
+++ b/src/net/eathena/mail2recv.cpp
@@ -119,45 +119,27 @@ void Mail2Recv::processAddItemResult(Net::MessageIn &msg)
 
     if (res != 0)
     {
-        Inventory *const inv = PlayerInfo::getInventory();
-        std::string itemName;
-        const Item *const item = inv->getItem(index);
-        if (item == nullptr)
-        {
-            const ItemInfo &info = ItemDB::get(itemId);
-            itemName = info.getName();
-        }
-        else
-        {
-            itemName = item->getName();
-        }
-
         switch (res)
         {
             case 1:
                 NotifyManager::notify(
-                    NotifyTypes::MAIL_ATTACH_ITEM_WEIGHT_ERROR,
-                    itemName);
+                    NotifyTypes::MAIL_ATTACH_ITEM_WEIGHT_ERROR);
                 break;
             case 2:
                 NotifyManager::notify(
-                    NotifyTypes::MAIL_ATTACH_ITEM_FATAL_ERROR,
-                    itemName);
+                    NotifyTypes::MAIL_ATTACH_ITEM_FATAL_ERROR);
                 break;
             case 3:
                 NotifyManager::notify(
-                    NotifyTypes::MAIL_ATTACH_ITEM_NO_SPACE,
-                    itemName);
+                    NotifyTypes::MAIL_ATTACH_ITEM_NO_SPACE);
                 break;
             case 4:
                 NotifyManager::notify(
-                    NotifyTypes::MAIL_ATTACH_ITEM_NOT_TRADEABLE,
-                    itemName);
+                    NotifyTypes::MAIL_ATTACH_ITEM_NOT_TRADEABLE);
                 break;
             default:
                 NotifyManager::notify(
-                    NotifyTypes::MAIL_ATTACH_ITEM_UNKNOWN_ERROR,
-                    itemName);
+                    NotifyTypes::MAIL_ATTACH_ITEM_UNKNOWN_ERROR);
                 UNIMPLEMENTEDPACKETFIELD(res);
                 break;
         }
-- 
cgit v1.2.3-60-g2f50