From f09d4ac3ad9d6a162c83a8148d82a50b12b0d80c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 26 Aug 2017 22:31:15 +0300 Subject: Remove unused fields from MailMessage struct. --- src/gui/mailmessage.h | 19 +------------------ src/net/eathena/mailrecv.cpp | 2 ++ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/gui/mailmessage.h b/src/gui/mailmessage.h index 70ad038fa..b1940c5e9 100644 --- a/src/gui/mailmessage.h +++ b/src/gui/mailmessage.h @@ -21,8 +21,6 @@ #ifndef GUI_MAILMESSAGE_H #define GUI_MAILMESSAGE_H -#include "const/resources/item/cards.h" - #include "enums/net/mailmessagetype.h" #include @@ -40,17 +38,9 @@ struct MailMessage final time(0), expireTime(0), money(0), - itemAmount(0), - itemId(0), - itemType(0), type(MailMessageType::Text), - itemAttribute(0U), - itemRefine(0U), - read(false), - itemIdentify(false) + read(false) { - for (int f = 0; f < 4; f ++) - card[f] = 0; } A_DELETE_COPY(MailMessage) @@ -59,18 +49,11 @@ struct MailMessage final std::string sender; std::string strTime; std::string text; - uint16_t card[maxMailCards]; int64_t id; int time; int expireTime; int money; - int itemAmount; - int itemId; - int itemType; MailMessageType::Type type; - uint8_t itemAttribute; - uint8_t itemRefine; bool read; - bool itemIdentify; }; #endif // GUI_MAILMESSAGE_H diff --git a/src/net/eathena/mailrecv.cpp b/src/net/eathena/mailrecv.cpp index 1293904ba..898c2f671 100644 --- a/src/net/eathena/mailrecv.cpp +++ b/src/net/eathena/mailrecv.cpp @@ -23,6 +23,8 @@ #include "itemcolormanager.h" #include "notifymanager.h" +#include "const/resources/item/cards.h" + #include "enums/resources/notifytypes.h" #include "gui/mailmessage.h" -- cgit v1.2.3-70-g09d2