diff options
Diffstat (limited to 'src/map/mail.c')
| -rw-r--r-- | src/map/mail.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/map/mail.c b/src/map/mail.c index 7ba7d7470..184e2be8d 100644 --- a/src/map/mail.c +++ b/src/map/mail.c @@ -6,17 +6,18 @@ #include "mail.h" +#include "map/atcommand.h" +#include "map/clif.h" +#include "map/itemdb.h" +#include "map/log.h" +#include "map/pc.h" +#include "map/storage.h" +#include "common/nullpo.h" +#include "common/showmsg.h" + #include <time.h> #include <string.h> -#include "atcommand.h" -#include "clif.h" -#include "itemdb.h" -#include "log.h" -#include "pc.h" -#include "../common/nullpo.h" -#include "../common/showmsg.h" - struct mail_interface mail_s; void mail_clear(struct map_session_data *sd) @@ -36,7 +37,7 @@ int mail_removeitem(struct map_session_data *sd, short flag) if( sd->mail.amount ) { if (flag) // Item send - pc->delitem(sd, sd->mail.index, sd->mail.amount, 1, 0, LOG_TYPE_MAIL); + pc->delitem(sd, sd->mail.index, sd->mail.amount, 1, DELITEM_NORMAL, LOG_TYPE_MAIL); else clif->additem(sd, sd->mail.index, sd->mail.amount, 0); } @@ -151,7 +152,7 @@ int mail_openmail(struct map_session_data *sd) { nullpo_ret(sd); - if( sd->state.storage_flag || sd->state.vending || sd->state.buyingstore || sd->state.trading ) + if (sd->state.storage_flag != STORAGE_FLAG_CLOSED || sd->state.vending || sd->state.buyingstore || sd->state.trading) return 0; clif->mail_window(sd->fd, 0); |