diff options
| author | shennetsind <ind@henn.et> | 2013-09-25 08:50:52 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-25 08:50:52 -0300 |
| commit | 1114eb3da58b078258a824424fef687a1ccee90c (patch) | |
| tree | 1b9c3e4ef48021ce89b331bba2d49061bd08f341 /src/map/mercenary.c | |
| parent | 78c7c6bf04a6c96d92524ae37ad165e65f599eb8 (diff) | |
| download | hercules-1114eb3da58b078258a824424fef687a1ccee90c.tar.gz hercules-1114eb3da58b078258a824424fef687a1ccee90c.tar.bz2 hercules-1114eb3da58b078258a824424fef687a1ccee90c.tar.xz hercules-1114eb3da58b078258a824424fef687a1ccee90c.zip | |
Renamed iTimer interface to timer.
Also removed duplicate mentions of timer within calls to shorten.
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index bf802c643..0e89d62a9 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -93,8 +93,8 @@ int mercenary_get_lifetime(struct mercenary_data *md) if( md == NULL || md->contract_timer == INVALID_TIMER ) return 0; - td = iTimer->get_timer(md->contract_timer); - return (td != NULL) ? DIFF_TICK(td->tick, iTimer->gettick()) : 0; + td = timer->get(md->contract_timer); + return (td != NULL) ? DIFF_TICK(td->tick, timer->gettick()) : 0; } int mercenary_get_guild(struct mercenary_data *md) @@ -269,14 +269,14 @@ void merc_contract_stop(struct mercenary_data *md) { nullpo_retv(md); if( md->contract_timer != INVALID_TIMER ) - iTimer->delete_timer(md->contract_timer, merc_contract_end); + timer->delete(md->contract_timer, merc_contract_end); md->contract_timer = INVALID_TIMER; } void merc_contract_init(struct mercenary_data *md) { if( md->contract_timer == INVALID_TIMER ) - md->contract_timer = iTimer->add_timer(iTimer->gettick() + md->mercenary.life_time, merc_contract_end, md->master->bl.id, 0); + md->contract_timer = timer->add(timer->gettick() + md->mercenary.life_time, merc_contract_end, md->master->bl.id, 0); md->regen.state.block = 0; } |