summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--sql-files/upgrade_svn10582.sql1
-rw-r--r--sql-files/upgrade_svn11582.sql1
-rw-r--r--src/char_sql/int_mail.c10
-rw-r--r--src/common/mmo.h21
-rw-r--r--src/map/clif.c77
-rw-r--r--src/map/clif.h2
-rw-r--r--src/map/intif.c37
-rw-r--r--src/map/mail.c6
9 files changed, 69 insertions, 87 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 8e32541ec..1aa8287d2 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/10/27
+ * Improvements/fixes to the mail system improvements :) [ultramage]
* Improvements to the mail system. Need Testing, [Zephyrus]
2007/10/26
* Moved the new novending cell check from the internal code to the
diff --git a/sql-files/upgrade_svn10582.sql b/sql-files/upgrade_svn10582.sql
deleted file mode 100644
index 795fb1208..000000000
--- a/sql-files/upgrade_svn10582.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `mail` CHANGE `read_flag` `status` SMALLINT(2) NOT NULL default 0;
diff --git a/sql-files/upgrade_svn11582.sql b/sql-files/upgrade_svn11582.sql
new file mode 100644
index 000000000..484a993db
--- /dev/null
+++ b/sql-files/upgrade_svn11582.sql
@@ -0,0 +1 @@
+ALTER TABLE `mail` CHANGE `read_flag` `status` TINYINT(2) NOT NULL default 0;
diff --git a/src/char_sql/int_mail.c b/src/char_sql/int_mail.c
index c38be689b..e3c47583c 100644
--- a/src/char_sql/int_mail.c
+++ b/src/char_sql/int_mail.c
@@ -38,8 +38,8 @@ static int mail_fromsql(int char_id, struct mail_data* md)
"`zeny`,`amount`,`nameid`,`refine`,`attribute`,`identify`");
for (i = 0; i < MAX_SLOTS; i++)
StringBuf_Printf(&buf, ",`card%d`", i);
- StringBuf_Printf(&buf, " FROM `%s` WHERE `dest_id`='%d' AND `status` > -1 AND `status` < 3 "
- "ORDER BY `id` LIMIT %d", mail_db, char_id, MAIL_MAX_INBOX + 1);
+ StringBuf_Printf(&buf, " FROM `%s` WHERE `dest_id`='%d' AND `status` >= %d AND `status` <= %d "
+ "ORDER BY `id` LIMIT %d", mail_db, char_id, MAIL_NEW, MAIL_READ, MAIL_MAX_INBOX + 1);
if( SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)) )
Sql_ShowDebug(sql_handle);
@@ -217,12 +217,12 @@ static void mapif_parse_Mail_requestinbox(int fd)
}
/*==========================================
- * 'Mail read' Mark
+ * Mark mail as 'Read'
*------------------------------------------*/
static void mapif_parse_Mail_read(int fd)
{
int mail_id = RFIFOL(fd,2);
- if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `read_flag` = '%d' WHERE `id` = '%d'", mail_db, MAIL_READED, mail_id) )
+ if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `status` = '%d' WHERE `id` = '%d'", mail_db, MAIL_READ, mail_id) )
Sql_ShowDebug(sql_handle);
}
@@ -262,7 +262,7 @@ static void mapif_Mail_getattach(int fd, int char_id, int mail_id)
if( msg.dest_id != char_id )
return;
- if( msg.status != MAIL_READED )
+ if( msg.status != MAIL_READ )
return;
if( (msg.item.nameid < 1 || msg.item.amount < 1) && msg.zeny < 1 )
diff --git a/src/common/mmo.h b/src/common/mmo.h
index d455e9124..ce0ddab25 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -241,6 +241,7 @@ struct mmo_charstatus {
#endif
};
+enum mail_status;
struct mail_message {
unsigned int id;
int send_id;
@@ -250,7 +251,7 @@ struct mail_message {
char title[MAIL_TITLE_LENGTH];
char body[MAIL_BODY_LENGTH];
- short status;
+ enum mail_status status;
unsigned int timestamp; // marks when the message was sent
int zeny;
@@ -408,24 +409,24 @@ struct fame_list {
char name[NAME_LENGTH];
};
-enum {
- GBI_EXP =1, // ギルドのEXP
- GBI_GUILDLV, // ギルドのLv
- GBI_SKILLPOINT, // ギルドのスキルポイント
- GBI_SKILLLV, // ギルドスキルLv
-};
-
-enum {
+enum mail_status {
MAIL_UNVERIFIED = -1,
MAIL_NEW,
MAIL_UNREAD,
- MAIL_READED,
+ MAIL_READ,
MAIL_DELETED,
MAIL_RETURNED,
MAIL_INVALID,
};
enum {
+ GBI_EXP =1, // ギルドのEXP
+ GBI_GUILDLV, // ギルドのLv
+ GBI_SKILLPOINT, // ギルドのスキルポイント
+ GBI_SKILLLV, // ギルドスキルLv
+};
+
+enum {
GMI_POSITION =0, // メンバーの役職変更
GMI_EXP,
GMI_HAIR,
diff --git a/src/map/clif.c b/src/map/clif.c
index 3dadc7e87..7dc99a493 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11231,9 +11231,7 @@ void clif_parse_ChangeHomunculusName(int fd, struct map_session_data *sd)
}
void clif_parse_HomMoveToMaster(int fd, struct map_session_data *sd)
-{ //[orn]
- nullpo_retv(sd);
-
+{
if(!merc_is_hom_active(sd->hd))
return;
@@ -11241,9 +11239,8 @@ void clif_parse_HomMoveToMaster(int fd, struct map_session_data *sd)
}
void clif_parse_HomMoveTo(int fd,struct map_session_data *sd)
-{ //[orn]
+{
short x,y,cmd;
- nullpo_retv(sd);
if(!merc_is_hom_active(sd->hd))
return;
@@ -11279,10 +11276,7 @@ void clif_parse_HomMenu(int fd, struct map_session_data *sd)
void clif_parse_AutoRevive(int fd, struct map_session_data *sd)
{
- int item_position;
-
- nullpo_retv(sd);
- item_position = pc_search_inventory(sd, 7621);
+ int item_position = pc_search_inventory(sd, 7621);
if (item_position < 0)
return;
@@ -11302,11 +11296,11 @@ void clif_parse_AutoRevive(int fd, struct map_session_data *sd)
/*------------------------------------------
* Reply to an Attachment operation
- * 0 : From inventory to Attachment OK
+ * 0 : Successfully attached item to mail
* 1 : Fail to set the attachment
- * 2 : Weight Problems (when get the attachment)
+ * 2 : Weight problems (when getting the attachment)
*------------------------------------------*/
-void clif_Mail_attachment(int fd, unsigned char flag)
+static void clif_Mail_attachment(int fd, uint8 flag)
{
WFIFOHEAD(fd,packet_len(0x245));
WFIFOW(fd,0) = 0x245;
@@ -11317,7 +11311,7 @@ void clif_Mail_attachment(int fd, unsigned char flag)
/*------------------------------------------
* Send Mail ack
* 0 : Message Send Ok
- * 1 : Destination char not found
+ * 1 : Recipient does not exist
*------------------------------------------*/
void clif_Mail_send(int fd, bool fail)
{
@@ -11358,16 +11352,13 @@ void clif_Mail_return(int fd, int mail_id, short fail)
/*------------------------------------------
* You have New Mail
*------------------------------------------*/
-void clif_Mail_new(struct map_session_data *sd, int mail_id, const char *sender, const char *title)
+void clif_Mail_new(int fd, int mail_id, const char *sender, const char *title)
{
- int fd = sd->fd;
- sd->mail.inbox.changed = true;
-
WFIFOHEAD(fd,packet_len(0x24a));
WFIFOW(fd,0) = 0x24a;
WFIFOL(fd,2) = mail_id;
- memcpy(WFIFOP(fd,6), sender, NAME_LENGTH);
- memcpy(WFIFOP(fd,30), title, MAIL_TITLE_LENGTH);
+ safestrncpy((char*)WFIFOP(fd,6), sender, NAME_LENGTH);
+ safestrncpy((char*)WFIFOP(fd,30), title, MAIL_TITLE_LENGTH);
WFIFOSET(fd,packet_len(0x24a));
}
@@ -11406,7 +11397,7 @@ void clif_Mail_refreshinbox(struct map_session_data *sd)
WFIFOL(fd,8+73*j) = msg->id;
memcpy(WFIFOP(fd,12+73*j), msg->title, MAIL_TITLE_LENGTH);
- WFIFOB(fd,52+73*j) = (msg->status == MAIL_UNREAD);
+ WFIFOB(fd,52+73*j) = (msg->status != MAIL_UNREAD); // 0: unread, 1: read
memcpy(WFIFOP(fd,53+73*j), msg->send_name, NAME_LENGTH);
WFIFOL(fd,77+73*j) = msg->timestamp;
j++;
@@ -11419,10 +11410,7 @@ void clif_Mail_refreshinbox(struct map_session_data *sd)
*------------------------------------------*/
void clif_parse_Mail_refreshinbox(int fd, struct map_session_data *sd)
{
- struct mail_data *md;
- nullpo_retv(sd);
-
- md = &sd->mail.inbox;
+ struct mail_data* md = &sd->mail.inbox;
if( md->amount < MAIL_MAX_INBOX && (md->full || md->changed) )
intif_Mail_requestinbox(sd->status.char_id, 1);
@@ -11443,8 +11431,8 @@ void clif_Mail_read(struct map_session_data *sd, int mail_id)
ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
if( i == MAIL_MAX_INBOX )
{
- clif_Mail_return(sd->fd, mail_id, 1); // Mail don't exists
- ShowWarning("clif_parse_Mail_read: account %d trying to read a message not the inbox.\n", sd->status.account_id);
+ clif_Mail_return(sd->fd, mail_id, 1); // Mail doesn't exist
+ ShowWarning("clif_parse_Mail_read: char '%s' trying to read a message not the inbox.\n", sd->status.name);
return;
}
else
@@ -11483,13 +11471,15 @@ void clif_Mail_read(struct map_session_data *sd, int mail_id)
WFIFOW(fd,95) = item->card[2];
WFIFOW(fd,97) = item->card[3];
}
+ else // no item, set all to zero
+ memset(WFIFOP(fd,80), 0x00, 19);
WFIFOB(fd,99) = (unsigned char)msg_len;
safestrncpy((char*)WFIFOP(fd,100), msg->body, msg_len);
WFIFOSET(fd,len);
if (msg->status == MAIL_UNREAD) {
- msg->status = MAIL_READED;
+ msg->status = MAIL_READ;
intif_Mail_read(mail_id);
clif_parse_Mail_refreshinbox(fd, sd);
}
@@ -11498,7 +11488,6 @@ void clif_Mail_read(struct map_session_data *sd, int mail_id)
void clif_parse_Mail_read(int fd, struct map_session_data *sd)
{
- nullpo_retv(sd);
clif_Mail_read(sd, RFIFOL(fd,2));
}
@@ -11508,7 +11497,6 @@ void clif_parse_Mail_read(int fd, struct map_session_data *sd)
void clif_parse_Mail_getattach(int fd, struct map_session_data *sd)
{
int i, mail_id = RFIFOL(fd,2);
- nullpo_retv(sd);
ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
if( i == MAIL_MAX_INBOX )
@@ -11546,7 +11534,6 @@ void clif_parse_Mail_getattach(int fd, struct map_session_data *sd)
void clif_parse_Mail_delete(int fd, struct map_session_data *sd)
{
int i, mail_id = RFIFOL(fd,2);
- nullpo_retv(sd);
ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
if (i < MAIL_MAX_INBOX)
@@ -11554,7 +11541,7 @@ void clif_parse_Mail_delete(int fd, struct map_session_data *sd)
struct mail_message *msg = &sd->mail.inbox.msg[i];
if( (msg->item.nameid > 0 && msg->item.amount > 0) || msg->zeny > 0 )
- {
+ {// can't delete mail without removing attachment first
clif_Mail_delete(sd->fd, mail_id, 1);
return;
}
@@ -11569,7 +11556,6 @@ void clif_parse_Mail_delete(int fd, struct map_session_data *sd)
void clif_parse_Mail_return(int fd, struct map_session_data *sd)
{
int i, mail_id = RFIFOL(fd,2);
- nullpo_retv(sd);
ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
if (i < MAIL_MAX_INBOX)
@@ -11587,22 +11573,22 @@ void clif_parse_Mail_setattach(int fd, struct map_session_data *sd)
int amount = RFIFOL(fd,4);
unsigned char flag;
- nullpo_retv(sd);
if (idx < 0 || amount < 0)
return;
flag = mail_setitem(sd, idx, amount);
- if (flag > -1)
- clif_Mail_attachment(fd,flag);
+ clif_Mail_attachment(fd,flag);
}
/*------------------------------------------
* Mail Window Operation
+ * 0 : Switch to 'new mail' window, or Close mailbox
+ * 1 : ???
+ * 2 : ???
*------------------------------------------*/
void clif_parse_Mail_winopen(int fd, struct map_session_data *sd)
{
int flag = RFIFOW(fd,2);
- nullpo_retv(sd);
if (flag == 0 || flag == 1)
mail_removeitem(sd, 0);
@@ -11610,13 +11596,14 @@ void clif_parse_Mail_winopen(int fd, struct map_session_data *sd)
mail_removezeny(sd, 0);
}
-
-/// S 0248 <packet len>.w <nick>.24B <title>.40B <body len>.B <message>.?B
+/*------------------------------------------
+ * Send Mail
+ * S 0248 <packet len>.w <nick>.24B <title>.40B <body len>.B <message>.?B 00
+ *------------------------------------------*/
void clif_parse_Mail_send(int fd, struct map_session_data *sd)
{
struct mail_message msg;
int body_len;
- nullpo_retv(sd);
if( sd->state.trading )
return;
@@ -11629,7 +11616,7 @@ void clif_parse_Mail_send(int fd, struct map_session_data *sd)
if( DIFF_TICK(sd->cansendmail_tick, gettick()) > 0 )
{
clif_displaymessage(sd->fd,"Cannot send mails too fast!!.");
- clif_Mail_send(fd, 1);
+ clif_Mail_send(fd, 1); // fail
return;
}
@@ -11640,7 +11627,7 @@ void clif_parse_Mail_send(int fd, struct map_session_data *sd)
if( !mail_getattach(sd, &msg) )
{
- clif_Mail_send(sd->fd, 1); // Fail
+ clif_Mail_send(sd->fd, 1); // fail
mail_removeitem(sd,0);
mail_removezeny(sd,0);
return;
@@ -11653,7 +11640,7 @@ void clif_parse_Mail_send(int fd, struct map_session_data *sd)
safestrncpy(msg.title, (char*)RFIFOP(fd,28), MAIL_TITLE_LENGTH);
if (body_len)
- memcpy(msg.body, RFIFOP(fd,69), body_len);
+ safestrncpy(msg.body, (char*)RFIFOP(fd,69), body_len+1);
else
memset(msg.body, 0x00, MAIL_BODY_LENGTH);
@@ -11782,9 +11769,9 @@ int clif_parse(int fd)
if (sd && sd->state.waitingdisconnect == 1) {
// 切断待ちの場合パケットを処理しない
- } else if (packet_db[packet_ver][cmd].func) {
- if (sd && sd->bl.prev == NULL &&
- packet_db[packet_ver][cmd].func != clif_parse_LoadEndAck)
+ } else
+ if (packet_db[packet_ver][cmd].func) {
+ if (sd && sd->bl.prev == NULL && packet_db[packet_ver][cmd].func != clif_parse_LoadEndAck)
; //Only valid packet when player is not on a map is the finish-loading packet.
else
if (sd
diff --git a/src/map/clif.h b/src/map/clif.h
index 1bcaa5499..7170b432b 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -389,7 +389,7 @@ void clif_Mail_read(struct map_session_data *sd, int mail_id);
void clif_Mail_delete(int fd, int mail_id, short fail);
void clif_Mail_return(int fd, int mail_id, short fail);
void clif_Mail_send(int fd, bool fail);
-void clif_Mail_new(struct map_session_data *sd, int mail_id, const char *sender, const char *title);
+void clif_Mail_new(int fd, int mail_id, const char *sender, const char *title);
void clif_Mail_refreshinbox(struct map_session_data *sd);
#endif
diff --git a/src/map/intif.c b/src/map/intif.c
index 211edfe2d..629f1f5d1 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -1690,54 +1690,49 @@ int intif_Mail_send(int account_id, struct mail_message *msg)
return 0;
}
-int intif_parse_Mail_send(int fd)
+static void intif_parse_Mail_send(int fd)
{
struct map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
int mail_id = RFIFOL(fd,6);
bool fail = false;
- if( mail_id > 0 )
+ if( mail_id == 0 )
+ fail = true;
+ else
{
if( sd == NULL )
fail = true;
if( !mail_checkattach(sd) )
{
- fail = true;
-
mail_removeitem(sd, 0);
mail_removezeny(sd, 0);
+ fail = true;
}
+ // confirmation message
WFIFOHEAD(inter_fd,7);
WFIFOW(inter_fd,0) = 0x304e;
WFIFOL(inter_fd,2) = mail_id;
WFIFOB(inter_fd,6) = fail;
WFIFOSET(inter_fd,7);
-
- clif_Mail_send(sd->fd, fail);
}
- else
- clif_Mail_send(sd->fd, true);
-
- return 0;
+
+ clif_Mail_send(sd->fd, fail);
}
-int intif_parse_Mail_new(int fd)
+static void intif_parse_Mail_new(int fd)
{
struct map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
- if( sd != NULL )
- {
- char sender_name[NAME_LENGTH], title[MAIL_TITLE_LENGTH];
- int mail_id = RFIFOL(fd,6);
-
- safestrncpy(sender_name, RFIFOP(fd,10), NAME_LENGTH);
- safestrncpy(title, RFIFOP(fd,34), MAIL_TITLE_LENGTH);
+ int mail_id = RFIFOL(fd,6);
+ const char* sender_name = (char*)RFIFOP(fd,10);
+ const char* title = (char*)RFIFOP(fd,34);
- clif_Mail_new(sd, mail_id, sender_name, title);
- }
+ if( sd == NULL )
+ return;
- return 0;
+ sd->mail.inbox.changed = true;
+ clif_Mail_new(sd->fd, mail_id, sender_name, title);
}
#endif
diff --git a/src/map/mail.c b/src/map/mail.c
index 59f7037e6..c95d6fbfa 100644
--- a/src/map/mail.c
+++ b/src/map/mail.c
@@ -55,12 +55,13 @@ unsigned char mail_setitem(struct map_session_data *sd, int idx, int amount)
if (idx == 0)
{ // Zeny Transfer
if (amount < 0)
- return 2;
+ return 2; //FIXME: totally wrong value
if (amount > sd->status.zeny)
amount = sd->status.zeny;
sd->mail.zeny = amount;
clif_updatestatus(sd, SP_ZENY);
+ return 0;
}
else
{ // Item Transfer
@@ -78,11 +79,8 @@ unsigned char mail_setitem(struct map_session_data *sd, int idx, int amount)
sd->mail.nameid = sd->status.inventory[idx].nameid;
sd->mail.amount = amount;
clif_delitem(sd, idx, amount);
-
return 0;
}
-
- return -1;
}
bool mail_getattach(struct map_session_data *sd, struct mail_message *msg)
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-14 23:38:54 +0000