diff options
| author | shennetsind <ind@henn.et> | 2013-06-14 08:56:59 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-06-14 08:56:59 -0300 |
| commit | 35dcafcc79892075bfbd5087b44116c6328cc533 (patch) | |
| tree | e3f0384980e03ef7baa41ea91dddf4ed4a701962 /src/map/script.c | |
| parent | 5a942993dd12ae7d85b1633a58b0dc23f85832c2 (diff) | |
| parent | 074b15c84bf9b624eee18ba31587d08d0a94ed49 (diff) | |
| download | hercules-35dcafcc79892075bfbd5087b44116c6328cc533.tar.gz hercules-35dcafcc79892075bfbd5087b44116c6328cc533.tar.bz2 hercules-35dcafcc79892075bfbd5087b44116c6328cc533.tar.xz hercules-35dcafcc79892075bfbd5087b44116c6328cc533.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/script.c b/src/map/script.c index 0ef12f74d..60f741d6c 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -3355,7 +3355,7 @@ static void script_detach_state(struct script_state* st, bool dequeue_event) * We're done with this NPC session, so we cancel the timer (if existent) and move on **/ if( sd->npc_idle_timer != INVALID_TIMER ) { - delete_timer(sd->npc_idle_timer,npc_rr_secure_timeout_timer); + iTimer->delete_timer(sd->npc_idle_timer,npc_rr_secure_timeout_timer); sd->npc_idle_timer = INVALID_TIMER; } #endif @@ -3396,8 +3396,8 @@ static void script_attach_state(struct script_state* st) **/ #ifdef SECURE_NPCTIMEOUT if( sd->npc_idle_timer == INVALID_TIMER ) - sd->npc_idle_timer = add_timer(gettick() + (SECURE_NPCTIMEOUT_INTERVAL*1000),npc_rr_secure_timeout_timer,sd->bl.id,0); - sd->npc_idle_tick = gettick(); + sd->npc_idle_timer = iTimer->add_timer(iTimer->gettick() + (SECURE_NPCTIMEOUT_INTERVAL*1000),npc_rr_secure_timeout_timer,sd->bl.id,0); + sd->npc_idle_tick = iTimer->gettick(); #endif } } |