From 3c8b17a9300d36cf6241edb6751f26af3b262c1e Mon Sep 17 00:00:00 2001 From: zephyrus Date: Wed, 13 Feb 2008 17:55:32 +0000 Subject: - Some fixes to mail system. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12199 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mail.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/map/mail.c') diff --git a/src/map/mail.c b/src/map/mail.c index 8c80412a9..5fef604c0 100644 --- a/src/map/mail.c +++ b/src/map/mail.c @@ -135,12 +135,6 @@ bool mail_setattachment(struct map_session_data *sd, struct mail_message *msg) void mail_getattachment(struct map_session_data* sd, int zeny, struct item* item) { - if( zeny > 0 ) - { - sd->status.zeny += zeny; - clif_updatestatus(sd, SP_ZENY); - } - if( item->nameid > 0 && item->amount > 0 ) { pc_additem(sd, item, item->amount); @@ -150,6 +144,9 @@ void mail_getattachment(struct map_session_data* sd, int zeny, struct item* item clif_Mail_getattachment(sd->fd, 0); } + + if( zeny > 0 ) + pc_getzeny(sd, zeny); } int mail_openmail(struct map_session_data *sd) @@ -159,9 +156,9 @@ int mail_openmail(struct map_session_data *sd) if( sd->state.finalsave == 1 || sd->state.storage_flag || sd->vender_id || sd->state.trading ) return 0; - clif_Mail_openmail(sd->fd); + clif_Mail_window(sd->fd, 0); - return 0; + return 1; } void mail_deliveryfail(struct map_session_data *sd, struct mail_message *msg) -- cgit v1.2.3-60-g2f50