From a675e06c38ec4e31a2758435a582b58a2199cfc4 Mon Sep 17 00:00:00 2001 From: Haru Date: Thu, 28 Jun 2018 03:17:32 +0200 Subject: Change functions to static where possible (Part 4 - map) This fixes issues with plugins defining symbols with the same names Signed-off-by: Haru --- src/map/mail.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'src/map/mail.c') diff --git a/src/map/mail.c b/src/map/mail.c index 1eb69bc90..d67e658fd 100644 --- a/src/map/mail.c +++ b/src/map/mail.c @@ -34,10 +34,10 @@ #include #include -struct mail_interface mail_s; +static struct mail_interface mail_s; struct mail_interface *mail; -void mail_clear(struct map_session_data *sd) +static void mail_clear(struct map_session_data *sd) { nullpo_retv(sd); sd->mail.nameid = 0; @@ -48,7 +48,7 @@ void mail_clear(struct map_session_data *sd) return; } -int mail_removeitem(struct map_session_data *sd, short flag) +static int mail_removeitem(struct map_session_data *sd, short flag) { nullpo_ret(sd); @@ -66,7 +66,7 @@ int mail_removeitem(struct map_session_data *sd, short flag) return 1; } -int mail_removezeny(struct map_session_data *sd, short flag) +static int mail_removezeny(struct map_session_data *sd, short flag) { nullpo_ret(sd); @@ -79,7 +79,8 @@ int mail_removezeny(struct map_session_data *sd, short flag) return 1; } -unsigned char mail_setitem(struct map_session_data *sd, int idx, int amount) { +static unsigned char mail_setitem(struct map_session_data *sd, int idx, int amount) +{ nullpo_retr(1, sd); if( pc_istrading(sd) ) @@ -116,7 +117,7 @@ unsigned char mail_setitem(struct map_session_data *sd, int idx, int amount) { } } -bool mail_setattachment(struct map_session_data *sd, struct mail_message *msg) +static bool mail_setattachment(struct map_session_data *sd, struct mail_message *msg) { int n; @@ -156,7 +157,7 @@ bool mail_setattachment(struct map_session_data *sd, struct mail_message *msg) return true; } -void mail_getattachment(struct map_session_data* sd, int zeny, struct item* item) +static void mail_getattachment(struct map_session_data *sd, int zeny, struct item *item) { nullpo_retv(sd); nullpo_retv(item); @@ -172,7 +173,7 @@ void mail_getattachment(struct map_session_data* sd, int zeny, struct item* item } } -int mail_openmail(struct map_session_data *sd) +static int mail_openmail(struct map_session_data *sd) { nullpo_ret(sd); @@ -184,7 +185,7 @@ int mail_openmail(struct map_session_data *sd) return 1; } -void mail_deliveryfail(struct map_session_data *sd, struct mail_message *msg) +static void mail_deliveryfail(struct map_session_data *sd, struct mail_message *msg) { nullpo_retv(sd); nullpo_retv(msg); @@ -204,7 +205,8 @@ void mail_deliveryfail(struct map_session_data *sd, struct mail_message *msg) } // This function only check if the mail operations are valid -bool mail_invalid_operation(struct map_session_data *sd) { +static bool mail_invalid_operation(struct map_session_data *sd) +{ nullpo_retr(false, sd); if( !map->list[sd->bl.m].flag.town && !pc->can_use_command(sd, "@mail") ) { ShowWarning("clif->parse_Mail: char '%s' trying to do invalid mail operations.\n", sd->status.name); -- cgit v1.2.3-60-g2f50