From ccfd2de6387f7919ef0c83fc3e48eb18b0fc5427 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 24 Jun 2018 22:04:10 +0200 Subject: Move some non-mapif functionality from the mapif interface to the inter_mercenary interface Signed-off-by: Haru --- src/char/int_mercenary.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'src/char/int_mercenary.c') diff --git a/src/char/int_mercenary.c b/src/char/int_mercenary.c index bf1df5588..6c94b62c9 100644 --- a/src/char/int_mercenary.c +++ b/src/char/int_mercenary.c @@ -104,7 +104,7 @@ bool inter_mercenary_owner_delete(int char_id) * @param[in,out] merc The new mercenary's data. * @retval false in case of errors. */ -bool mapif_mercenary_create(struct s_mercenary *merc) +bool inter_mercenary_create(struct s_mercenary *merc) { nullpo_retr(false, merc); Assert_retr(false, merc->mercenary_id == 0); @@ -126,7 +126,7 @@ bool mapif_mercenary_create(struct s_mercenary *merc) * @param merc The mercenary's data. * @retval false in case of errors. */ -bool mapif_mercenary_save(const struct s_mercenary *merc) +bool inter_mercenary_save(const struct s_mercenary *merc) { nullpo_retr(false, merc); Assert_retr(false, merc->mercenary_id > 0); @@ -141,7 +141,7 @@ bool mapif_mercenary_save(const struct s_mercenary *merc) return true; } -bool mapif_mercenary_load(int merc_id, int char_id, struct s_mercenary *merc) +bool inter_mercenary_load(int merc_id, int char_id, struct s_mercenary *merc) { char* data; @@ -174,7 +174,7 @@ bool mapif_mercenary_load(int merc_id, int char_id, struct s_mercenary *merc) return true; } -bool mapif_mercenary_delete(int merc_id) +bool inter_mercenary_delete(int merc_id) { if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `mer_id` = '%d'", mercenary_db, merc_id) ) { @@ -205,14 +205,14 @@ void mapif_parse_mercenary_create(int fd, const struct s_mercenary *merc) memcpy(&merc_, merc, sizeof(merc_)); - result = mapif->mercenary_create(&merc_); + result = inter_mercenary->create(&merc_); mapif->mercenary_send(fd, &merc_, result); } void mapif_parse_mercenary_load(int fd, int merc_id, int char_id) { struct s_mercenary merc; - bool result = mapif->mercenary_load(merc_id, char_id, &merc); + bool result = inter_mercenary->load(merc_id, char_id, &merc); mapif->mercenary_send(fd, &merc, result); } @@ -226,7 +226,7 @@ void mapif_mercenary_deleted(int fd, unsigned char flag) void mapif_parse_mercenary_delete(int fd, int merc_id) { - bool result = mapif->mercenary_delete(merc_id); + bool result = inter_mercenary->delete(merc_id); mapif->mercenary_deleted(fd, result); } @@ -240,7 +240,7 @@ void mapif_mercenary_saved(int fd, unsigned char flag) void mapif_parse_mercenary_save(int fd, struct s_mercenary* merc) { - bool result = mapif->mercenary_save(merc); + bool result = inter_mercenary->save(merc); mapif->mercenary_saved(fd, result); } @@ -282,4 +282,9 @@ void inter_mercenary_defaults(void) inter_mercenary->sql_init = inter_mercenary_sql_init; inter_mercenary->sql_final = inter_mercenary_sql_final; inter_mercenary->parse_frommap = inter_mercenary_parse_frommap; + + inter_mercenary->create = inter_mercenary_create; + inter_mercenary->load = inter_mercenary_load; + inter_mercenary->save = inter_mercenary_save; + inter_mercenary->delete = inter_mercenary_delete; } -- cgit v1.2.3-60-g2f50