diff options
| author | Susu <bruant.bastien@gmail.com> | 2013-07-29 16:05:51 +0200 |
|---|---|---|
| committer | Susu <bruant.bastien@gmail.com> | 2013-07-29 16:05:51 +0200 |
| commit | b7171479a47490ff80bf04849f763158d6d96fac (patch) | |
| tree | 54392801c4087f4cfe0b351596fc6f36546beb6b /src/map/unit.c | |
| parent | 853489bcb5f2acfce14731b117ddc2b246042883 (diff) | |
| download | hercules-b7171479a47490ff80bf04849f763158d6d96fac.tar.gz hercules-b7171479a47490ff80bf04849f763158d6d96fac.tar.bz2 hercules-b7171479a47490ff80bf04849f763158d6d96fac.tar.xz hercules-b7171479a47490ff80bf04849f763158d6d96fac.zip | |
Added mercenary interface
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index b9cdfa278..1860be342 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -2252,7 +2252,7 @@ int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file, case BL_MER: { struct mercenary_data *md = (struct mercenary_data *)bl; ud->canact_tick = ud->canmove_tick; - if( mercenary_get_lifetime(md) <= 0 && !(md->master && !md->master->state.active) ) + if( mercenary->get_lifetime(md) <= 0 && !(md->master && !md->master->state.active) ) { clif->clearunit_area(bl,clrtype); iMap->delblock(bl); @@ -2531,8 +2531,8 @@ int unit_free(struct block_list *bl, clr_type clrtype) { struct mercenary_data *md = (TBL_MER*)bl; struct map_session_data *sd = md->master; - if( mercenary_get_lifetime(md) > 0 ) - mercenary_save(md); + if( mercenary->get_lifetime(md) > 0 ) + mercenary->save(md); else { intif->mercenary_delete(md->mercenary.mercenary_id); @@ -2542,7 +2542,7 @@ int unit_free(struct block_list *bl, clr_type clrtype) if( sd ) sd->md = NULL; - merc_contract_stop(md); + mercenary->merc_contract_stop(md); break; } case BL_ELEM: { |