summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/char_sql/int_mail.c949
-rw-r--r--src/char_sql/inter.c42
-rw-r--r--src/char_sql/inter.h7
-rw-r--r--src/common/mmo.h8
-rw-r--r--src/map/clif.c30
5 files changed, 492 insertions, 544 deletions
diff --git a/src/char_sql/int_mail.c b/src/char_sql/int_mail.c
index 4c21861c3..7c6b4afe5 100644
--- a/src/char_sql/int_mail.c
+++ b/src/char_sql/int_mail.c
@@ -1,476 +1,473 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-struct mail_data *mail_data_pt = NULL;
-
-time_t calc_times(void)
-{
- time_t temp = time(NULL);
- return mktime(localtime(&temp));
-}
-
-int mail_fromsql(int char_id, struct mail_data *md)
-{
- int i, j;
- struct mail_message *msg;
- struct item *item;
- char *data;
- StringBuf buf;
-
- memset(md, 0, sizeof(struct mail_data));
- md->amount = 0;
- md->satured = 0;
-
- StringBuf_Init(&buf);
- StringBuf_AppendStr(&buf, "SELECT `id`,`send_name`,`send_id`,`dest_name`,`dest_id`,`title`,`message`,`time`,`read_flag`,"
- "`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' ORDER BY `id` LIMIT %d", mail_db, char_id, MAX_MAIL_INBOX + 1);
-
- if( SQL_ERROR == Sql_Query(mail_handle, StringBuf_Value(&buf)) )
- Sql_ShowDebug(mail_handle);
-
- StringBuf_Destroy(&buf);
-
- for (i = 0; i < MAX_MAIL_INBOX && SQL_SUCCESS == Sql_NextRow(mail_handle); ++i )
- {
- msg = &md->msg[i];
- Sql_GetData(mail_handle, 0, &data, NULL); msg->id = atoi(data);
- Sql_GetData(mail_handle, 1, &data, NULL); safestrncpy(msg->send_name, data, NAME_LENGTH);
- Sql_GetData(mail_handle, 2, &data, NULL); msg->send_id = atoi(data);
- Sql_GetData(mail_handle, 3, &data, NULL); safestrncpy(msg->dest_name, data, NAME_LENGTH);
- Sql_GetData(mail_handle, 4, &data, NULL); msg->dest_id = atoi(data);
- Sql_GetData(mail_handle, 5, &data, NULL); safestrncpy(msg->title, data, MAIL_TITLE_LENGTH);
- Sql_GetData(mail_handle, 6, &data, NULL); safestrncpy(msg->body, data, MAIL_BODY_LENGTH);
- Sql_GetData(mail_handle, 7, &data, NULL); msg->timestamp = atoi(data);
- Sql_GetData(mail_handle, 8, &data, NULL); msg->read = atoi(data);
- Sql_GetData(mail_handle, 9, &data, NULL); msg->zeny = atoi(data);
- item = &msg->item;
- Sql_GetData(mail_handle,10, &data, NULL); item->amount = (short)atoi(data);
- Sql_GetData(mail_handle,11, &data, NULL); item->nameid = atoi(data);
- Sql_GetData(mail_handle,12, &data, NULL); item->refine = atoi(data);
- Sql_GetData(mail_handle,13, &data, NULL); item->attribute = atoi(data);
- Sql_GetData(mail_handle,14, &data, NULL); item->identify = atoi(data);
-
- for (j = 0; j < MAX_SLOTS; j++)
- {
- Sql_GetData(mail_handle, 15 + j, &data, NULL);
- item->card[j] = atoi(data);
- }
- }
-
- if ( SQL_SUCCESS == Sql_NextRow(mail_handle) )
- md->satured = 1; // New Mails cannot arrive
- else
- md->satured = 0;
-
- md->amount = i;
- md->changed = 0;
- Sql_FreeResult(mail_handle);
-
- md->unchecked = 0;
- md->unreaded = 0;
- for (i = 0; i < md->amount; i++)
- {
- msg = &md->msg[i];
- if (!msg->read)
- {
- if ( SQL_ERROR == Sql_Query(mail_handle, "UPDATE `%s` SET `read_flag` = '1' WHERE `id` = '%d'", mail_db, msg->id) )
- Sql_ShowDebug(mail_handle);
-
- md->unchecked++;
- }
- else if ( msg->read == 1 )
- md->unreaded++;
-
- msg->read = (msg->read < 2)?0:1;
- }
-
- ShowInfo("mail load complete from DB - id: %d (total: %d)\n", char_id, md->amount);
- return 1;
-}
-
-int mail_savemessage(struct mail_message *msg)
-{
- StringBuf buf;
- int j;
- char esc_send_name[NAME_LENGTH*2+1], esc_dest_name[NAME_LENGTH*2+1];
- char esc_title[MAIL_TITLE_LENGTH*2+1], esc_body[MAIL_BODY_LENGTH*2+1];
-
- if (!msg)
- return 0;
-
- Sql_EscapeStringLen(mail_handle, esc_send_name, msg->send_name, strnlen(msg->send_name, NAME_LENGTH));
- Sql_EscapeStringLen(mail_handle, esc_dest_name, msg->dest_name, strnlen(msg->dest_name, NAME_LENGTH));
- Sql_EscapeStringLen(mail_handle, esc_title, msg->title, strnlen(msg->title, MAIL_TITLE_LENGTH));
- Sql_EscapeStringLen(mail_handle, esc_body, msg->body, strnlen(msg->body, MAIL_BODY_LENGTH));
-
- StringBuf_Init(&buf);
- StringBuf_Printf(&buf, "INSERT INTO `%s` (`send_name`, `send_id`, `dest_name`, `dest_id`, `title`, `message`, `time`, `read_flag`, `zeny`, `amount`, `nameid`, `refine`, `attribute`, `identify`", mail_db);
- for (j = 0; j < MAX_SLOTS; j++)
- StringBuf_Printf(&buf, ", `card%d`", j);
- StringBuf_Printf(&buf, ") VALUES ('%s', '%d', '%s', '%d', '%s', '%s', '%d', '0', '%d', '%d', '%d', '%d', '%d', '%d'",
- esc_send_name, msg->send_id, esc_dest_name, msg->dest_id, esc_title, esc_body, msg->timestamp, msg->zeny, msg->item.amount, msg->item.nameid, msg->item.refine, msg->item.attribute, msg->item.identify);
- for (j = 0; j < MAX_SLOTS; j++)
- StringBuf_Printf(&buf, ", '%d'", msg->item.card[j]);
- StringBuf_AppendStr(&buf, ")");
-
- if( SQL_ERROR == Sql_QueryStr(mail_handle, StringBuf_Value(&buf)) )
- {
- Sql_ShowDebug(mail_handle);
- j = 0;
- }
- else
- j = (int)Sql_LastInsertId(mail_handle);
-
- StringBuf_Destroy(&buf);
-
- return j;
-}
-
-int mail_loadmessage(int char_id, int mail_id, struct mail_message *message, short flag)
-{
- char *data;
- struct item *item;
- int j = 0;
- StringBuf buf;
-
- StringBuf_Init(&buf);
- StringBuf_AppendStr(&buf, "SELECT `id`,`send_name`,`send_id`,`dest_name`,`dest_id`,`title`,`message`,`time`,`read_flag`,"
- "`zeny`,`amount`,`nameid`,`refine`,`attribute`,`identify`");
- for (j = 0; j < MAX_SLOTS; j++)
- StringBuf_Printf(&buf, ",`card%d`", j);
- StringBuf_Printf(&buf, " FROM `%s` WHERE `dest_id` = '%d' AND `id` = '%d'", mail_db, char_id, mail_id);
-
- if( SQL_ERROR == Sql_Query(mail_handle, StringBuf_Value(&buf)) )
- Sql_ShowDebug(mail_handle);
- else if( Sql_NumRows(mail_handle) == 0 )
- ShowWarning("Char %d trying to read an invalid mail.\n", char_id);
- else
- {
- Sql_NextRow(mail_handle);
-
- Sql_GetData(mail_handle, 0, &data, NULL); message->id = atoi(data);
- Sql_GetData(mail_handle, 1, &data, NULL); safestrncpy(message->send_name, data, NAME_LENGTH);
- Sql_GetData(mail_handle, 2, &data, NULL); message->send_id = atoi(data);
- Sql_GetData(mail_handle, 3, &data, NULL); safestrncpy(message->dest_name, data, NAME_LENGTH);
- Sql_GetData(mail_handle, 4, &data, NULL); message->dest_id = atoi(data);
- Sql_GetData(mail_handle, 5, &data, NULL); safestrncpy(message->title, data, MAIL_TITLE_LENGTH);
- Sql_GetData(mail_handle, 6, &data, NULL); safestrncpy(message->body, data, MAIL_BODY_LENGTH);
- Sql_GetData(mail_handle, 7, &data, NULL); message->timestamp = atoi(data);
- Sql_GetData(mail_handle, 8, &data, NULL); message->read = atoi(data);
- Sql_GetData(mail_handle, 9, &data, NULL); message->zeny = atoi(data);
- item = &message->item;
- Sql_GetData(mail_handle,10, &data, NULL); item->amount = (short)atoi(data);
- Sql_GetData(mail_handle,11, &data, NULL); item->nameid = atoi(data);
- Sql_GetData(mail_handle,12, &data, NULL); item->refine = atoi(data);
- Sql_GetData(mail_handle,13, &data, NULL); item->attribute = atoi(data);
- Sql_GetData(mail_handle,14, &data, NULL); item->identify = atoi(data);
- for (j = 0; j < MAX_SLOTS; j++)
- {
- Sql_GetData(mail_handle,15 + j, &data, NULL);
- item->card[j] = atoi(data);
- }
-
- j = 1;
- }
-
- StringBuf_Destroy(&buf);
- Sql_FreeResult(mail_handle);
-
- if (message->read == 1)
- {
- message->read = 0;
- if (flag)
- if ( SQL_ERROR == Sql_Query(mail_handle, "UPDATE `%s` SET `read_flag` = '2' WHERE `id` = '%d'", mail_db, message->id) )
- Sql_ShowDebug(mail_handle);
- }
- else
- message->read = 1;
-
- return j;
-}
-
-/*==========================================
- * Client Inbox Request
- *------------------------------------------*/
-int mapif_Mail_sendinbox(int fd, int char_id, unsigned char flag)
-{
- WFIFOHEAD(fd, sizeof(struct mail_data) + 9);
- mail_fromsql(char_id, mail_data_pt);
- WFIFOW(fd,0) = 0x3848;
- WFIFOW(fd,2) = sizeof(struct mail_data) + 9;
- WFIFOL(fd,4) = char_id;
- WFIFOB(fd,8) = flag;
- memcpy(WFIFOP(fd,9),mail_data_pt,sizeof(struct mail_data));
- WFIFOSET(fd,WFIFOW(fd,2));
-
- return 0;
-}
-
-int mapif_parse_Mail_requestinbox(int fd)
-{
- RFIFOHEAD(fd);
- mapif_Mail_sendinbox(fd, RFIFOL(fd,2), RFIFOB(fd,6));
-
- return 0;
-}
-
-/*==========================================
- * Mail Readed Mark
- *------------------------------------------*/
-int mapif_parse_Mail_read(int fd)
-{
- int mail_id;
- RFIFOHEAD(fd);
-
- mail_id = RFIFOL(fd,2);
- if( SQL_ERROR == Sql_Query(mail_handle, "UPDATE `%s` SET `read_flag` = '2' WHERE `id` = '%d'", mail_db, mail_id) )
- Sql_ShowDebug(mail_handle);
-
- return 0;
-}
-
-/*==========================================
- * Client Attachment Request
- *------------------------------------------*/
-int mail_DeleteAttach(int mail_id)
-{
- StringBuf buf;
- int i;
-
- StringBuf_Init(&buf);
- StringBuf_Printf(&buf, "UPDATE `%s` SET `zeny` = '0', `nameid` = '0', `amount` = '0', `refine` = '0', `attribute` = '0', `identify` = '0'", mail_db);
- for (i = 0; i < MAX_SLOTS; i++)
- StringBuf_Printf(&buf, ", `card%d` = '0'", i);
- StringBuf_Printf(&buf, " WHERE `id` = '%d'", mail_id);
-
- if( SQL_ERROR == Sql_Query(mail_handle, StringBuf_Value(&buf)) )
- {
- Sql_ShowDebug(mail_handle);
- StringBuf_Destroy(&buf);
-
- return 0;
- }
-
- StringBuf_Destroy(&buf);
- return 1;
-}
-
-int mapif_Mail_getattach(int fd, int char_id, int mail_id)
-{
- struct mail_message *message = (struct mail_message*)aCalloc(sizeof(struct mail_message), 1);
-
- if( mail_loadmessage(char_id, mail_id, message, 0) )
- {
- if( (message->item.nameid < 1 || message->item.amount < 1) && message->zeny < 1 )
- {
- aFree(message);
- return 0; // No Attachment
- }
-
- if( mail_DeleteAttach(mail_id) )
- {
- WFIFOHEAD(fd, sizeof(struct item) + 12);
- WFIFOW(fd,0) = 0x384a;
- WFIFOW(fd,2) = sizeof(struct item) + 12;
- WFIFOL(fd,4) = char_id;
- WFIFOL(fd,8) = (message->zeny > 0)?message->zeny:0;
- memcpy(WFIFOP(fd,12), &message->item, sizeof(struct item));
- WFIFOSET(fd,WFIFOW(fd,2));
- }
- }
-
- aFree(message);
- return 0;
-}
-
-int mapif_parse_Mail_getattach(int fd)
-{
- RFIFOHEAD(fd);
- mapif_Mail_getattach(fd, RFIFOL(fd,2), RFIFOL(fd,6));
- return 0;
-}
-
-/*==========================================
- * Delete Mail
- *------------------------------------------*/
-int mapif_Mail_delete(int fd, int char_id, int mail_id)
-{
- short flag = 0;
-
- if ( SQL_ERROR == Sql_Query(mail_handle, "DELETE FROM `%s` WHERE `id` = '%d'", mail_db, mail_id) )
- {
- Sql_ShowDebug(mail_handle);
- flag = 1;
- }
-
- WFIFOHEAD(fd,11);
- WFIFOW(fd,0) = 0x384b;
- WFIFOL(fd,2) = char_id;
- WFIFOL(fd,6) = mail_id;
- WFIFOW(fd,10) = flag;
- WFIFOSET(fd,12);
-
- return 0;
-}
-
-int mapif_parse_Mail_delete(int fd)
-{
- RFIFOHEAD(fd);
- mapif_Mail_delete(fd, RFIFOL(fd,2), RFIFOL(fd,6));
- return 0;
-}
-/*==========================================
- * Return Mail
- *------------------------------------------*/
-int mapif_Mail_return(int fd, int char_id, int mail_id)
-{
- struct mail_message *msg = (struct mail_message*)aCalloc(sizeof(struct mail_message), 1);
- int new_mail = 0;
-
- if( mail_loadmessage(char_id, mail_id, msg, 0) )
- {
- if( SQL_ERROR == Sql_Query(mail_handle, "DELETE FROM `%s` WHERE `id` = '%d'", mail_db, mail_id) )
- Sql_ShowDebug(mail_handle);
- else
- {
- char temp_[MAIL_TITLE_LENGTH];
-
- swap(msg->send_id, msg->dest_id);
- safestrncpy(temp_, msg->send_name, NAME_LENGTH);
- safestrncpy(msg->send_name, msg->dest_name, NAME_LENGTH);
- safestrncpy(msg->dest_name, temp_, NAME_LENGTH);
-
- snprintf(temp_, MAIL_TITLE_LENGTH, "RE:%s", msg->title);
- safestrncpy(msg->title, temp_, MAIL_TITLE_LENGTH);
- msg->timestamp = (unsigned int)calc_times();
-
- new_mail = mail_savemessage(msg);
- }
- }
-
- aFree(msg);
-
- WFIFOHEAD(fd,14);
- WFIFOW(fd,0) = 0x384c;
- WFIFOL(fd,2) = char_id;
- WFIFOL(fd,6) = mail_id;
- WFIFOL(fd,10) = new_mail;
- WFIFOSET(fd,14);
-
- return 0;
-}
-
-int mapif_parse_Mail_return(int fd)
-{
- RFIFOHEAD(fd);
- mapif_Mail_return(fd, RFIFOL(fd,2), RFIFOL(fd,6));
- return 0;
-}
-
-int mapif_Mail_send(int fd, struct mail_message *msg)
-{
- int len = strlen(msg->title) + 16;
-
- WFIFOHEAD(fd,len);
- WFIFOW(fd,0) = 0x384d;
- WFIFOW(fd,2) = len;
- WFIFOL(fd,4) = msg->send_id;
- WFIFOL(fd,8) = msg->id;
- WFIFOL(fd,12) = msg->dest_id;
- memcpy(WFIFOP(fd,16), msg->title, strlen(msg->title));
- WFIFOSET(fd,len);
-
- return 0;
-}
-
-int mapif_parse_Mail_send(int fd)
-{
- struct mail_message *msg;
- int mail_id = 0, account_id = 0;
-
- if(RFIFOW(fd,2) != 8 + sizeof(struct mail_message))
- return 0;
-
- msg = (struct mail_message*)aCalloc(sizeof(struct mail_message), 1);
- memcpy(msg, RFIFOP(fd,8), sizeof(struct mail_message));
-
- account_id = RFIFOL(fd,4);
-
- if( !msg->dest_id )
- {
- // Try to find the Dest Char by Name
- char esc_name[NAME_LENGTH*2+1];
-
- Sql_EscapeStringLen(sql_handle, esc_name, msg->dest_name, strnlen(msg->dest_name, NAME_LENGTH));
- if ( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`, `char_id` FROM `%s` WHERE `name` = '%s'", char_db, esc_name) )
- Sql_ShowDebug(sql_handle);
- else if ( Sql_NumRows(sql_handle) > 0 )
- {
- char *data;
- Sql_NextRow(sql_handle);
- Sql_GetData(sql_handle, 0, &data, NULL);
- if (atoi(data) != account_id)
- { // Cannot sends mail to char in the same account
- Sql_GetData(sql_handle, 1, &data, NULL);
- msg->dest_id = atoi(data);
- }
- }
- Sql_FreeResult(sql_handle);
- }
-
- if( msg->dest_id > 0 )
- mail_id = mail_savemessage(msg);
-
- msg->id = mail_id;
- mapif_Mail_send(fd, msg);
-
- aFree(msg);
- return 0;
-}
-
-/*==========================================
- * Packets From Map Server
- *------------------------------------------*/
-int inter_mail_parse_frommap(int fd)
-{
- switch(RFIFOW(fd,0))
- {
- case 0x3048: mapif_parse_Mail_requestinbox(fd); break;
- case 0x3049: mapif_parse_Mail_read(fd); break;
- case 0x304a: mapif_parse_Mail_getattach(fd); break;
- case 0x304b: mapif_parse_Mail_delete(fd); break;
- case 0x304c: mapif_parse_Mail_return(fd); break;
- case 0x304d: mapif_parse_Mail_send(fd); break;
- default:
- return 0;
- }
- return 1;
-}
-
-int inter_mail_sql_init(void)
-{
- mail_data_pt = (struct mail_data*)aCalloc(sizeof(struct mail_data), 1);
- return 1;
-}
-
-void inter_mail_sql_final(void)
-{
- if (mail_data_pt) aFree(mail_data_pt);
- return;
-}
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#include "../common/mmo.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/sql.h"
+#include "char.h"
+#include "inter.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+struct mail_data *mail_data_pt = NULL;
+
+time_t calc_times(void)
+{
+ time_t temp = time(NULL);
+ return mktime(localtime(&temp));
+}
+
+int mail_fromsql(int char_id, struct mail_data *md)
+{
+ int i, j;
+ struct mail_message *msg;
+ struct item *item;
+ char *data;
+ StringBuf buf;
+
+ memset(md, 0, sizeof(struct mail_data));
+ md->amount = 0;
+ md->full = FALSE;
+
+ StringBuf_Init(&buf);
+ StringBuf_AppendStr(&buf, "SELECT `id`,`send_name`,`send_id`,`dest_name`,`dest_id`,`title`,`message`,`time`,`read_flag`,"
+ "`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' ORDER BY `id` LIMIT %d", mail_db, char_id, MAIL_MAX_INBOX + 1);
+
+ if( SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)) )
+ Sql_ShowDebug(sql_handle);
+
+ StringBuf_Destroy(&buf);
+
+ for (i = 0; i < MAIL_MAX_INBOX && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
+ {
+ msg = &md->msg[i];
+ Sql_GetData(sql_handle, 0, &data, NULL); msg->id = atoi(data);
+ Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(msg->send_name, data, NAME_LENGTH);
+ Sql_GetData(sql_handle, 2, &data, NULL); msg->send_id = atoi(data);
+ Sql_GetData(sql_handle, 3, &data, NULL); safestrncpy(msg->dest_name, data, NAME_LENGTH);
+ Sql_GetData(sql_handle, 4, &data, NULL); msg->dest_id = atoi(data);
+ Sql_GetData(sql_handle, 5, &data, NULL); safestrncpy(msg->title, data, MAIL_TITLE_LENGTH);
+ Sql_GetData(sql_handle, 6, &data, NULL); safestrncpy(msg->body, data, MAIL_BODY_LENGTH);
+ Sql_GetData(sql_handle, 7, &data, NULL); msg->timestamp = atoi(data);
+ Sql_GetData(sql_handle, 8, &data, NULL); msg->read = atoi(data);
+ Sql_GetData(sql_handle, 9, &data, NULL); msg->zeny = atoi(data);
+ item = &msg->item;
+ Sql_GetData(sql_handle,10, &data, NULL); item->amount = (short)atoi(data);
+ Sql_GetData(sql_handle,11, &data, NULL); item->nameid = atoi(data);
+ Sql_GetData(sql_handle,12, &data, NULL); item->refine = atoi(data);
+ Sql_GetData(sql_handle,13, &data, NULL); item->attribute = atoi(data);
+ Sql_GetData(sql_handle,14, &data, NULL); item->identify = atoi(data);
+
+ for (j = 0; j < MAX_SLOTS; j++)
+ {
+ Sql_GetData(sql_handle, 15 + j, &data, NULL);
+ item->card[j] = atoi(data);
+ }
+ }
+
+ md->full = ( Sql_NumRows(sql_handle) > MAIL_MAX_INBOX );
+
+ md->amount = i;
+ md->changed = FALSE;
+ Sql_FreeResult(sql_handle);
+
+ md->unchecked = 0;
+ md->unreaded = 0;
+ for (i = 0; i < md->amount; i++)
+ {
+ msg = &md->msg[i];
+ if (!msg->read)
+ {
+ if ( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `read_flag` = '1' WHERE `id` = '%d'", mail_db, msg->id) )
+ Sql_ShowDebug(sql_handle);
+
+ md->unchecked++;
+ }
+ else if ( msg->read == 1 )
+ md->unreaded++;
+
+ msg->read = (msg->read < 2)?0:1;
+ }
+
+ ShowInfo("mail load complete from DB - id: %d (total: %d)\n", char_id, md->amount);
+ return 1;
+}
+
+int mail_savemessage(struct mail_message *msg)
+{
+ StringBuf buf;
+ int j;
+ char esc_send_name[NAME_LENGTH*2+1], esc_dest_name[NAME_LENGTH*2+1];
+ char esc_title[MAIL_TITLE_LENGTH*2+1], esc_body[MAIL_BODY_LENGTH*2+1];
+
+ if (!msg)
+ return 0;
+
+ Sql_EscapeStringLen(sql_handle, esc_send_name, msg->send_name, strnlen(msg->send_name, NAME_LENGTH));
+ Sql_EscapeStringLen(sql_handle, esc_dest_name, msg->dest_name, strnlen(msg->dest_name, NAME_LENGTH));
+ Sql_EscapeStringLen(sql_handle, esc_title, msg->title, strnlen(msg->title, MAIL_TITLE_LENGTH));
+ Sql_EscapeStringLen(sql_handle, esc_body, msg->body, strnlen(msg->body, MAIL_BODY_LENGTH));
+
+ StringBuf_Init(&buf);
+ StringBuf_Printf(&buf, "INSERT INTO `%s` (`send_name`, `send_id`, `dest_name`, `dest_id`, `title`, `message`, `time`, `read_flag`, `zeny`, `amount`, `nameid`, `refine`, `attribute`, `identify`", mail_db);
+ for (j = 0; j < MAX_SLOTS; j++)
+ StringBuf_Printf(&buf, ", `card%d`", j);
+ StringBuf_Printf(&buf, ") VALUES ('%s', '%d', '%s', '%d', '%s', '%s', '%d', '0', '%d', '%d', '%d', '%d', '%d', '%d'",
+ esc_send_name, msg->send_id, esc_dest_name, msg->dest_id, esc_title, esc_body, msg->timestamp, msg->zeny, msg->item.amount, msg->item.nameid, msg->item.refine, msg->item.attribute, msg->item.identify);
+ for (j = 0; j < MAX_SLOTS; j++)
+ StringBuf_Printf(&buf, ", '%d'", msg->item.card[j]);
+ StringBuf_AppendStr(&buf, ")");
+
+ if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
+ {
+ Sql_ShowDebug(sql_handle);
+ j = 0;
+ }
+ else
+ j = (int)Sql_LastInsertId(sql_handle);
+
+ StringBuf_Destroy(&buf);
+
+ return j;
+}
+
+int mail_loadmessage(int char_id, int mail_id, struct mail_message *message, short flag)
+{
+ char *data;
+ struct item *item;
+ int j = 0;
+ StringBuf buf;
+
+ StringBuf_Init(&buf);
+ StringBuf_AppendStr(&buf, "SELECT `id`,`send_name`,`send_id`,`dest_name`,`dest_id`,`title`,`message`,`time`,`read_flag`,"
+ "`zeny`,`amount`,`nameid`,`refine`,`attribute`,`identify`");
+ for (j = 0; j < MAX_SLOTS; j++)
+ StringBuf_Printf(&buf, ",`card%d`", j);
+ StringBuf_Printf(&buf, " FROM `%s` WHERE `dest_id` = '%d' AND `id` = '%d'", mail_db, char_id, mail_id);
+
+ if( SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)) )
+ Sql_ShowDebug(sql_handle);
+ else if( Sql_NumRows(sql_handle) == 0 )
+ ShowWarning("Char %d trying to read an invalid mail.\n", char_id);
+ else
+ {
+ Sql_NextRow(sql_handle);
+
+ Sql_GetData(sql_handle, 0, &data, NULL); message->id = atoi(data);
+ Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(message->send_name, data, NAME_LENGTH);
+ Sql_GetData(sql_handle, 2, &data, NULL); message->send_id = atoi(data);
+ Sql_GetData(sql_handle, 3, &data, NULL); safestrncpy(message->dest_name, data, NAME_LENGTH);
+ Sql_GetData(sql_handle, 4, &data, NULL); message->dest_id = atoi(data);
+ Sql_GetData(sql_handle, 5, &data, NULL); safestrncpy(message->title, data, MAIL_TITLE_LENGTH);
+ Sql_GetData(sql_handle, 6, &data, NULL); safestrncpy(message->body, data, MAIL_BODY_LENGTH);
+ Sql_GetData(sql_handle, 7, &data, NULL); message->timestamp = atoi(data);
+ Sql_GetData(sql_handle, 8, &data, NULL); message->read = atoi(data);
+ Sql_GetData(sql_handle, 9, &data, NULL); message->zeny = atoi(data);
+ item = &message->item;
+ Sql_GetData(sql_handle,10, &data, NULL); item->amount = (short)atoi(data);
+ Sql_GetData(sql_handle,11, &data, NULL); item->nameid = atoi(data);
+ Sql_GetData(sql_handle,12, &data, NULL); item->refine = atoi(data);
+ Sql_GetData(sql_handle,13, &data, NULL); item->attribute = atoi(data);
+ Sql_GetData(sql_handle,14, &data, NULL); item->identify = atoi(data);
+ for (j = 0; j < MAX_SLOTS; j++)
+ {
+ Sql_GetData(sql_handle,15 + j, &data, NULL);
+ item->card[j] = atoi(data);
+ }
+
+ j = 1;
+ }
+
+ StringBuf_Destroy(&buf);
+ Sql_FreeResult(sql_handle);
+
+ if (message->read == 1)
+ {
+ message->read = 0;
+ if (flag)
+ if ( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `read_flag` = '2' WHERE `id` = '%d'", mail_db, message->id) )
+ Sql_ShowDebug(sql_handle);
+ }
+ else
+ message->read = 1;
+
+ return j;
+}
+
+/*==========================================
+ * Client Inbox Request
+ *------------------------------------------*/
+int mapif_Mail_sendinbox(int fd, int char_id, unsigned char flag)
+{
+ WFIFOHEAD(fd, sizeof(struct mail_data) + 9);
+ mail_fromsql(char_id, mail_data_pt);
+ WFIFOW(fd,0) = 0x3848;
+ WFIFOW(fd,2) = sizeof(struct mail_data) + 9;
+ WFIFOL(fd,4) = char_id;
+ WFIFOB(fd,8) = flag;
+ memcpy(WFIFOP(fd,9),mail_data_pt,sizeof(struct mail_data));
+ WFIFOSET(fd,WFIFOW(fd,2));
+
+ return 0;
+}
+
+int mapif_parse_Mail_requestinbox(int fd)
+{
+ RFIFOHEAD(fd);
+ mapif_Mail_sendinbox(fd, RFIFOL(fd,2), RFIFOB(fd,6));
+
+ return 0;
+}
+
+/*==========================================
+ * Mail Readed Mark
+ *------------------------------------------*/
+int mapif_parse_Mail_read(int fd)
+{
+ int mail_id;
+ RFIFOHEAD(fd);
+
+ mail_id = RFIFOL(fd,2);
+ if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `read_flag` = '2' WHERE `id` = '%d'", mail_db, mail_id) )
+ Sql_ShowDebug(sql_handle);
+
+ return 0;
+}
+
+/*==========================================
+ * Client Attachment Request
+ *------------------------------------------*/
+int mail_DeleteAttach(int mail_id)
+{
+ StringBuf buf;
+ int i;
+
+ StringBuf_Init(&buf);
+ StringBuf_Printf(&buf, "UPDATE `%s` SET `zeny` = '0', `nameid` = '0', `amount` = '0', `refine` = '0', `attribute` = '0', `identify` = '0'", mail_db);
+ for (i = 0; i < MAX_SLOTS; i++)
+ StringBuf_Printf(&buf, ", `card%d` = '0'", i);
+ StringBuf_Printf(&buf, " WHERE `id` = '%d'", mail_id);
+
+ if( SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)) )
+ {
+ Sql_ShowDebug(sql_handle);
+ StringBuf_Destroy(&buf);
+
+ return 0;
+ }
+
+ StringBuf_Destroy(&buf);
+ return 1;
+}
+
+int mapif_Mail_getattach(int fd, int char_id, int mail_id)
+{
+ struct mail_message *message = (struct mail_message*)aCalloc(sizeof(struct mail_message), 1);
+
+ if( mail_loadmessage(char_id, mail_id, message, 0) )
+ {
+ if( (message->item.nameid < 1 || message->item.amount < 1) && message->zeny < 1 )
+ {
+ aFree(message);
+ return 0; // No Attachment
+ }
+
+ if( mail_DeleteAttach(mail_id) )
+ {
+ WFIFOHEAD(fd, sizeof(struct item) + 12);
+ WFIFOW(fd,0) = 0x384a;
+ WFIFOW(fd,2) = sizeof(struct item) + 12;
+ WFIFOL(fd,4) = char_id;
+ WFIFOL(fd,8) = (message->zeny > 0)?message->zeny:0;
+ memcpy(WFIFOP(fd,12), &message->item, sizeof(struct item));
+ WFIFOSET(fd,WFIFOW(fd,2));
+ }
+ }
+
+ aFree(message);
+ return 0;
+}
+
+int mapif_parse_Mail_getattach(int fd)
+{
+ RFIFOHEAD(fd);
+ mapif_Mail_getattach(fd, RFIFOL(fd,2), RFIFOL(fd,6));
+ return 0;
+}
+
+/*==========================================
+ * Delete Mail
+ *------------------------------------------*/
+int mapif_Mail_delete(int fd, int char_id, int mail_id)
+{
+ short flag = 0;
+
+ if ( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `id` = '%d'", mail_db, mail_id) )
+ {
+ Sql_ShowDebug(sql_handle);
+ flag = 1;
+ }
+
+ WFIFOHEAD(fd,11);
+ WFIFOW(fd,0) = 0x384b;
+ WFIFOL(fd,2) = char_id;
+ WFIFOL(fd,6) = mail_id;
+ WFIFOW(fd,10) = flag;
+ WFIFOSET(fd,12);
+
+ return 0;
+}
+
+int mapif_parse_Mail_delete(int fd)
+{
+ RFIFOHEAD(fd);
+ mapif_Mail_delete(fd, RFIFOL(fd,2), RFIFOL(fd,6));
+ return 0;
+}
+/*==========================================
+ * Return Mail
+ *------------------------------------------*/
+int mapif_Mail_return(int fd, int char_id, int mail_id)
+{
+ struct mail_message *msg = (struct mail_message*)aCalloc(sizeof(struct mail_message), 1);
+ int new_mail = 0;
+
+ if( mail_loadmessage(char_id, mail_id, msg, 0) )
+ {
+ if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `id` = '%d'", mail_db, mail_id) )
+ Sql_ShowDebug(sql_handle);
+ else
+ {
+ char temp_[MAIL_TITLE_LENGTH];
+
+ swap(msg->send_id, msg->dest_id);
+ safestrncpy(temp_, msg->send_name, NAME_LENGTH);
+ safestrncpy(msg->send_name, msg->dest_name, NAME_LENGTH);
+ safestrncpy(msg->dest_name, temp_, NAME_LENGTH);
+
+ snprintf(temp_, MAIL_TITLE_LENGTH, "RE:%s", msg->title);
+ safestrncpy(msg->title, temp_, MAIL_TITLE_LENGTH);
+ msg->timestamp = (unsigned int)calc_times();
+
+ new_mail = mail_savemessage(msg);
+ }
+ }
+
+ aFree(msg);
+
+ WFIFOHEAD(fd,14);
+ WFIFOW(fd,0) = 0x384c;
+ WFIFOL(fd,2) = char_id;
+ WFIFOL(fd,6) = mail_id;
+ WFIFOL(fd,10) = new_mail;
+ WFIFOSET(fd,14);
+
+ return 0;
+}
+
+int mapif_parse_Mail_return(int fd)
+{
+ RFIFOHEAD(fd);
+ mapif_Mail_return(fd, RFIFOL(fd,2), RFIFOL(fd,6));
+ return 0;
+}
+
+int mapif_Mail_send(int fd, struct mail_message *msg)
+{
+ int len = strlen(msg->title) + 16;
+
+ WFIFOHEAD(fd,len);
+ WFIFOW(fd,0) = 0x384d;
+ WFIFOW(fd,2) = len;
+ WFIFOL(fd,4) = msg->send_id;
+ WFIFOL(fd,8) = msg->id;
+ WFIFOL(fd,12) = msg->dest_id;
+ memcpy(WFIFOP(fd,16), msg->title, strlen(msg->title));
+ WFIFOSET(fd,len);
+
+ return 0;
+}
+
+int mapif_parse_Mail_send(int fd)
+{
+ struct mail_message *msg;
+ int mail_id = 0, account_id = 0;
+
+ if(RFIFOW(fd,2) != 8 + sizeof(struct mail_message))
+ return 0;
+
+ msg = (struct mail_message*)aCalloc(sizeof(struct mail_message), 1);
+ memcpy(msg, RFIFOP(fd,8), sizeof(struct mail_message));
+
+ account_id = RFIFOL(fd,4);
+
+ if( !msg->dest_id )
+ {
+ // Try to find the Dest Char by Name
+ char esc_name[NAME_LENGTH*2+1];
+
+ Sql_EscapeStringLen(sql_handle, esc_name, msg->dest_name, strnlen(msg->dest_name, NAME_LENGTH));
+ if ( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`, `char_id` FROM `%s` WHERE `name` = '%s'", char_db, esc_name) )
+ Sql_ShowDebug(sql_handle);
+ else if ( Sql_NumRows(sql_handle) > 0 )
+ {
+ char *data;
+ Sql_NextRow(sql_handle);
+ Sql_GetData(sql_handle, 0, &data, NULL);
+ if (atoi(data) != account_id)
+ { // Cannot sends mail to char in the same account
+ Sql_GetData(sql_handle, 1, &data, NULL);
+ msg->dest_id = atoi(data);
+ }
+ }
+ Sql_FreeResult(sql_handle);
+ }
+
+ if( msg->dest_id > 0 )
+ mail_id = mail_savemessage(msg);
+
+ msg->id = mail_id;
+ mapif_Mail_send(fd, msg);
+
+ aFree(msg);
+ return 0;
+}
+
+/*==========================================
+ * Packets From Map Server
+ *------------------------------------------*/
+int inter_mail_parse_frommap(int fd)
+{
+ switch(RFIFOW(fd,0))
+ {
+ case 0x3048: mapif_parse_Mail_requestinbox(fd); break;
+ case 0x3049: mapif_parse_Mail_read(fd); break;
+ case 0x304a: mapif_parse_Mail_getattach(fd); break;
+ case 0x304b: mapif_parse_Mail_delete(fd); break;
+ case 0x304c: mapif_parse_Mail_return(fd); break;
+ case 0x304d: mapif_parse_Mail_send(fd); break;
+ default:
+ return 0;
+ }
+ return 1;
+}
+
+int inter_mail_sql_init(void)
+{
+ mail_data_pt = (struct mail_data*)aCalloc(sizeof(struct mail_data), 1);
+ return 1;
+}
+
+void inter_mail_sql_final(void)
+{
+ if (mail_data_pt) aFree(mail_data_pt);
+ return;
+}
diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c
index e37c258a1..739b458be 100644
--- a/src/char_sql/inter.c
+++ b/src/char_sql/inter.c
@@ -27,7 +27,6 @@
Sql* sql_handle = NULL;
Sql* lsql_handle = NULL;
-Sql* mail_handle = NULL;
int char_server_port = 3306;
char char_server_ip[32] = "127.0.0.1";
@@ -42,12 +41,6 @@ char login_server_id[32] = "ragnarok";
char login_server_pw[32] = "ragnarok";
char login_server_db[32] = "ragnarok";
-int mail_server_port = 3306;
-char mail_server_ip[32] = "127.0.0.1";
-char mail_server_id[32] = "ragnarok";
-char mail_server_pw[32] = "ragnarok";
-char mail_server_db[32] = "ragnarok";
-
#ifndef TXT_SQL_CONVERT
static struct accreg *accreg_pt;
@@ -278,28 +271,6 @@ static int inter_config_read(const char* cfgName)
strcpy(login_server_db, w2);
ShowStatus ("set login_server_db : %s\n", w2);
}
- // MAIL SYSTEM
- else
- if(!strcmpi(w1,"mail_server_ip")) {
- strcpy(mail_server_ip, w2);
- ShowStatus ("set mail_server_ip : %s\n", w2);
- } else
- if(!strcmpi(w1,"mail_server_port")) {
- mail_server_port = atoi(w2);
- ShowStatus ("set mail_server_port : %s\n", w2);
- } else
- if(!strcmpi(w1,"mail_server_id")) {
- strcpy(mail_server_id, w2);
- ShowStatus ("set mail_server_id : %s\n", w2);
- } else
- if(!strcmpi(w1,"mail_server_pw")) {
- strcpy(mail_server_pw, w2);
- ShowStatus ("set mail_server_pw : %s\n", w2);
- } else
- if(!strcmpi(w1,"mail_server_db")) {
- strcpy(mail_server_db, w2);
- ShowStatus ("set mail_server_db : %s\n", w2);
- }
#ifndef TXT_SQL_CONVERT
else if(!strcmpi(w1,"party_share_level"))
party_share_level = atoi(w2);
@@ -344,7 +315,6 @@ int inter_sql_ping(int tid, unsigned int tick, int id, int data)
{
ShowInfo("Pinging SQL server to keep connection alive...\n");
Sql_Ping(sql_handle);
- Sql_Ping(mail_handle);
if( char_gm_read )
Sql_Ping(lsql_handle);
return 0;
@@ -389,16 +359,6 @@ int inter_init_sql(const char *file)
Sql_Free(sql_handle);
exit(EXIT_FAILURE);
}
- // MAIL SYSTEM
- mail_handle = Sql_Malloc();
- ShowInfo("Connect Mail DB server.... (Character Server)\n");
- if ( SQL_ERROR == Sql_Connect(mail_handle, mail_server_id, mail_server_pw, mail_server_ip, (uint16)mail_server_port, mail_server_db) )
- {
- Sql_ShowDebug(mail_handle);
- Sql_Free(mail_handle);
- Sql_Free(sql_handle);
- exit(EXIT_FAILURE);
- }
#ifndef TXT_SQL_CONVERT
else if (inter_sql_test()) {
ShowStatus("Connect Success! (Character Server)\n");
@@ -411,7 +371,6 @@ int inter_init_sql(const char *file)
{
Sql_ShowDebug(lsql_handle);
Sql_Free(lsql_handle);
- Sql_Free(mail_handle);
Sql_Free(sql_handle);
exit(EXIT_FAILURE);
}
@@ -472,7 +431,6 @@ int inter_sql_test (void)
ShowSQL ("Field `%s` not be found in `%s`. Consider updating your database!\n", fields[i], char_db);
if( lsql_handle )
Sql_Free(lsql_handle);
- Sql_Free(mail_handle);
Sql_Free(sql_handle);
exit(EXIT_FAILURE);
}
diff --git a/src/char_sql/inter.h b/src/char_sql/inter.h
index 3f4999e5a..c79290c80 100644
--- a/src/char_sql/inter.h
+++ b/src/char_sql/inter.h
@@ -26,7 +26,6 @@ extern char inter_log_filename[1024];
extern Sql* sql_handle;
extern Sql* lsql_handle;
-extern Sql* mail_handle;
extern int char_server_port;
extern char char_server_ip[32];
@@ -40,12 +39,6 @@ extern char login_db_server_id[32];
extern char login_db_server_pw[32];
extern char login_db_server_db[32];
-extern int mail_server_port;
-extern char mail_server_ip[32];
-extern char mail_server_id[32];
-extern char mail_server_pw[32];
-extern char mail_server_db[32];
-
extern char main_chat_nick[16];
int inter_accreg_tosql(int account_id, int char_id, struct accreg *reg, int type);
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 5374cf9b4..2389264d9 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -106,7 +106,7 @@
#define HM_CLASS_MAX (HM_CLASS_BASE+MAX_HOMUNCULUS_CLASS-1)
//Mail System
-#define MAX_MAIL_INBOX 30
+#define MAIL_MAX_INBOX 30
#define MAIL_TITLE_LENGTH 40
#define MAIL_BODY_LENGTH 200
@@ -260,9 +260,9 @@ struct mail_message {
struct mail_data {
short amount;
- short changed;
- short satured;
- struct mail_message msg[MAX_MAIL_INBOX];
+ bool changed, full;
+
+ struct mail_message msg[MAIL_MAX_INBOX];
short unchecked, unreaded;
};
diff --git a/src/map/clif.c b/src/map/clif.c
index 956a5751e..36a306f0c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11326,7 +11326,7 @@ void clif_Mail_refreshinbox(struct map_session_data *sd)
WFIFOW(fd,0) = 0x240;
WFIFOW(fd,2) = len;
WFIFOL(fd,4) = md->amount;
- for( i = j = 0; i < MAX_MAIL_INBOX && j < md->amount; i++ )
+ for( i = j = 0; i < MAIL_MAX_INBOX && j < md->amount; i++ )
{
msg = &md->msg[i];
if (msg->id < 1)
@@ -11351,7 +11351,7 @@ void clif_parse_Mail_refreshinbox(int fd, struct map_session_data *sd)
nullpo_retv(sd);
md = &sd->mail.inbox;
- if( md->amount < MAX_MAIL_INBOX && (md->satured || md->changed) )
+ if( md->amount < MAIL_MAX_INBOX && (md->full || md->changed) )
intif_Mail_requestinbox(sd->status.char_id, 1);
else
clif_Mail_refreshinbox(sd);
@@ -11367,8 +11367,8 @@ void clif_Mail_read(struct map_session_data *sd, int mail_id)
{
int i, fd = sd->fd;
- ARR_FIND(0, MAX_MAIL_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
- if (i < MAX_MAIL_INBOX)
+ ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
+ if (i < MAIL_MAX_INBOX)
{
struct mail_message *msg = &sd->mail.inbox.msg[i];
struct item *item = &msg->item;
@@ -11444,8 +11444,8 @@ 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, MAX_MAIL_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
- if (i < MAX_MAIL_INBOX)
+ ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
+ if (i < MAIL_MAX_INBOX)
{
if (sd->mail.inbox.msg[i].zeny < 1 && (sd->mail.inbox.msg[i].item.nameid < 1 || sd->mail.inbox.msg[i].item.amount < 1))
return;
@@ -11485,8 +11485,8 @@ void clif_Mail_delete(struct map_session_data *sd, int mail_id, short flag)
if (!flag)
{
int i;
- ARR_FIND(0, MAX_MAIL_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
- if( i < MAX_MAIL_INBOX )
+ ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
+ if( i < MAIL_MAX_INBOX )
{
memset(&sd->mail.inbox.msg[i], 0, sizeof(struct mail_message));
sd->mail.inbox.amount--;
@@ -11499,7 +11499,7 @@ void clif_Mail_delete(struct map_session_data *sd, int mail_id, short flag)
WFIFOW(fd,6) = flag;
WFIFOSET(fd, packet_len(0x257));
- if( !flag && sd->mail.inbox.satured )
+ if( !flag && sd->mail.inbox.full )
intif_Mail_requestinbox(sd->status.char_id, 1); // Reload the Mail Inbox
}
@@ -11508,8 +11508,8 @@ 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, MAX_MAIL_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
- if (i < MAX_MAIL_INBOX)
+ ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
+ if (i < MAIL_MAX_INBOX)
{
struct mail_message *msg = &sd->mail.inbox.msg[i];
@@ -11543,8 +11543,8 @@ 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, MAX_MAIL_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
- if (i < MAX_MAIL_INBOX)
+ ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
+ if (i < MAIL_MAX_INBOX)
intif_Mail_return(sd->status.char_id, mail_id);
}
@@ -11555,8 +11555,8 @@ void clif_Mail_return(struct map_session_data *sd, int mail_id, int new_mail)
if (new_mail > 0)
{
int i;
- ARR_FIND(0, MAX_MAIL_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
- if (i < MAX_MAIL_INBOX)
+ ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
+ if (i < MAIL_MAX_INBOX)
{
struct map_session_data *rd = map_charid2sd(sd->mail.inbox.msg[i].send_id);
if (rd)
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 18:36:59 +0000