diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-11-08 12:34:30 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-11-15 11:47:29 +0300 |
| commit | 7e6df4619270cbec689f4d6d73c5fc0498c2ed18 (patch) | |
| tree | 627a223f0a29c392dd0c7a17977032198dce4155 /src/char/char.c | |
| parent | 72427289b387df3394eeadf629d3510f60742970 (diff) | |
| download | hercules-7e6df4619270cbec689f4d6d73c5fc0498c2ed18.tar.gz hercules-7e6df4619270cbec689f4d6d73c5fc0498c2ed18.tar.bz2 hercules-7e6df4619270cbec689f4d6d73c5fc0498c2ed18.tar.xz hercules-7e6df4619270cbec689f4d6d73c5fc0498c2ed18.zip | |
Add most functions from int_mercenary.c to interfaces.
Diffstat (limited to 'src/char/char.c')
| -rw-r--r-- | src/char/char.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/char/char.c b/src/char/char.c index 82a3fade9..8ade532f2 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -546,7 +546,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 (inter_mercenary_owner_tosql(char_id, p)) + if (inter_mercenary->owner_tosql(char_id, p)) strcat(save_status, " mercenary"); else errors++; @@ -1396,7 +1396,7 @@ int char_mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_every #endif /* Mercenary Owner DataBase */ - inter_mercenary_owner_fromsql(char_id, p); + inter_mercenary->owner_fromsql(char_id, p); strcat(t_msg, " mercenary"); /* default */ @@ -1821,7 +1821,7 @@ int char_delete_char_sql(int char_id) mapif->elemental_delete(elemental_id); /* remove mercenary data */ - inter_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) ) @@ -6011,6 +6011,7 @@ void char_load_defaults(void) inter_guild_defaults(); inter_homunculus_defaults(); inter_mail_defaults(); + inter_mercenary_defaults(); } void char_defaults(void) |