summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/char_sql/int_auction.c15
-rw-r--r--src/map/clif.c2
2 files changed, 8 insertions, 9 deletions
diff --git a/src/char_sql/int_auction.c b/src/char_sql/int_auction.c
index 40db47e0a..9ee2e0afd 100644
--- a/src/char_sql/int_auction.c
+++ b/src/char_sql/int_auction.c
@@ -122,22 +122,21 @@ static int auction_end_timer(int tid, unsigned int tick, int id, int data)
struct mail_message msg;
memset(&msg, 0, sizeof(struct mail_message));
- msg.send_id = auction->seller_id;
- safestrncpy(msg.send_name, auction->seller_name, NAME_LENGTH);
+ msg.send_id = 0;
+ safestrncpy(msg.send_name, "Auction Manager", NAME_LENGTH);
+ safestrncpy(msg.title, "Auction", MAIL_TITLE_LENGTH);
msg.timestamp = (unsigned int)calc_times();
if( auction->buyer_id )
{ // Send item to Buyer's Mail (custom messages)
msg.dest_id = auction->buyer_id;
safestrncpy(msg.dest_name, auction->buyer_name, NAME_LENGTH);
- safestrncpy(msg.title, "[Auction Winner] Your Item", MAIL_TITLE_LENGTH);
safestrncpy(msg.body, "Thanks, you won the auction!.", MAIL_BODY_LENGTH);
}
else
{ // Return item to Seller's Mail (custom messages)
msg.dest_id = auction->seller_id;
safestrncpy(msg.dest_name, auction->seller_name, NAME_LENGTH);
- safestrncpy(msg.title, "[Auction Fail] Your Item", MAIL_TITLE_LENGTH);
safestrncpy(msg.body, "Sorry, No one buy your item...", MAIL_BODY_LENGTH);
}
@@ -150,16 +149,16 @@ static int auction_end_timer(int tid, unsigned int tick, int id, int data)
{ // Send Money to Seller
memset(&msg, 0, sizeof(struct mail_message));
- msg.send_id = auction->buyer_id;
- safestrncpy(msg.send_name, auction->buyer_name, NAME_LENGTH);
+ msg.send_id = 0;
+ safestrncpy(msg.send_name, "Auction Manager", NAME_LENGTH);
msg.dest_id = auction->seller_id;
safestrncpy(msg.dest_name, auction->seller_name, NAME_LENGTH);
msg.timestamp = (unsigned int)calc_times();
msg.zeny = auction->price;
// Custom Messages, need more info
- safestrncpy(msg.title, "[Auction] Your Zeny", MAIL_TITLE_LENGTH);
- safestrncpy(msg.body, "Thanks, you won the auction!.", MAIL_BODY_LENGTH);
+ safestrncpy(msg.title, "Auction", MAIL_TITLE_LENGTH);
+ safestrncpy(msg.body, "Here is the money from your Auction.", MAIL_BODY_LENGTH);
mail_savemessage(&msg);
mapif_Mail_new(&msg);
diff --git a/src/map/clif.c b/src/map/clif.c
index 3088b040b..a3ee81e0b 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11615,7 +11615,7 @@ void clif_parse_Mail_return(int fd, struct map_session_data *sd)
return;
ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
- if (i < MAIL_MAX_INBOX)
+ if( i < MAIL_MAX_INBOX && sd->mail.inbox.msg[i].send_id != 0 )
intif_Mail_return(sd->status.char_id, mail_id);
else
clif_Mail_return(sd->fd, mail_id, 1);