diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-11-02 23:47:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-11-15 11:47:29 +0300 |
| commit | 40fa73e07e4afd1aea967be86aed0407e7e85de5 (patch) | |
| tree | 4138aa06b37f47efeee9f7aef8781bca28a2840b | |
| parent | ec163f471d04ecf1566a53a0109073afde837407 (diff) | |
| download | hercules-40fa73e07e4afd1aea967be86aed0407e7e85de5.tar.gz hercules-40fa73e07e4afd1aea967be86aed0407e7e85de5.tar.bz2 hercules-40fa73e07e4afd1aea967be86aed0407e7e85de5.tar.xz hercules-40fa73e07e4afd1aea967be86aed0407e7e85de5.zip | |
Add prefix inter_mercenary_ to most functions in int_mercenary.c
| -rw-r--r-- | src/char/char.c | 6 | ||||
| -rw-r--r-- | src/char/int_mercenary.c | 6 | ||||
| -rw-r--r-- | src/char/int_mercenary.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/char/char.c b/src/char/char.c index ff284d45b..4aa7b1c6a 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -552,7 +552,7 @@ int char_mmo_char_tosql(int char_id, struct mmo_charstatus* p) (p->spear_calls != cp->spear_calls) || (p->spear_faith != cp->spear_faith) || (p->sword_calls != cp->sword_calls) || (p->sword_faith != cp->sword_faith) ) { - if (mercenary_owner_tosql(char_id, p)) + if (inter_mercenary_owner_tosql(char_id, p)) strcat(save_status, " mercenary"); else errors++; @@ -1405,7 +1405,7 @@ int char_mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_every #endif /* Mercenary Owner DataBase */ - mercenary_owner_fromsql(char_id, p); + inter_mercenary_owner_fromsql(char_id, p); strcat(t_msg, " mercenary"); /* default */ @@ -1835,7 +1835,7 @@ int char_delete_char_sql(int char_id) mapif_elemental_delete(elemental_id); /* remove mercenary data */ - mercenary_owner_delete(char_id); + inter_mercenary_owner_delete(char_id); /* delete char's friends list */ if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", friend_db, char_id) ) diff --git a/src/char/int_mercenary.c b/src/char/int_mercenary.c index 1dffb656c..ff7f9fa1f 100644 --- a/src/char/int_mercenary.c +++ b/src/char/int_mercenary.c @@ -20,7 +20,7 @@ #include "../common/strlib.h" #include "../common/utils.h" -bool mercenary_owner_fromsql(int char_id, struct mmo_charstatus *status) +bool inter_mercenary_owner_fromsql(int char_id, struct mmo_charstatus *status) { char* data; @@ -48,7 +48,7 @@ bool mercenary_owner_fromsql(int char_id, struct mmo_charstatus *status) return true; } -bool mercenary_owner_tosql(int char_id, struct mmo_charstatus *status) +bool inter_mercenary_owner_tosql(int char_id, struct mmo_charstatus *status) { if( SQL_ERROR == SQL->Query(sql_handle, "REPLACE INTO `%s` (`char_id`, `merc_id`, `arch_calls`, `arch_faith`, `spear_calls`, `spear_faith`, `sword_calls`, `sword_faith`) VALUES ('%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')", mercenary_owner_db, char_id, status->mer_id, status->arch_calls, status->arch_faith, status->spear_calls, status->spear_faith, status->sword_calls, status->sword_faith) ) @@ -60,7 +60,7 @@ bool mercenary_owner_tosql(int char_id, struct mmo_charstatus *status) return true; } -bool mercenary_owner_delete(int char_id) +bool inter_mercenary_owner_delete(int char_id) { if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", mercenary_owner_db, char_id) ) Sql_ShowDebug(sql_handle); diff --git a/src/char/int_mercenary.h b/src/char/int_mercenary.h index b03c20de3..504b2fca6 100644 --- a/src/char/int_mercenary.h +++ b/src/char/int_mercenary.h @@ -13,9 +13,9 @@ void inter_mercenary_sql_final(void); int inter_mercenary_parse_frommap(int fd); // Mercenary Owner Database -bool mercenary_owner_fromsql(int char_id, struct mmo_charstatus *status); -bool mercenary_owner_tosql(int char_id, struct mmo_charstatus *status); -bool mercenary_owner_delete(int char_id); +bool inter_mercenary_owner_fromsql(int char_id, struct mmo_charstatus *status); +bool inter_mercenary_owner_tosql(int char_id, struct mmo_charstatus *status); +bool inter_mercenary_owner_delete(int char_id); bool mapif_mercenary_delete(int merc_id); |