diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-06-14 01:59:38 -0700 |
|---|---|---|
| committer | Euphy <euphy@rathena.org> | 2013-06-15 15:55:04 -0400 |
| commit | 120f66ccd935a1522bb70361ccd6d70829862e56 (patch) | |
| tree | 268ba409af3a59ed20afc10b273f5a814276128c /src/map/script.c | |
| parent | e600fec6e33d1677c147fe933d7f58ea5fc80a7a (diff) | |
| download | hercules-120f66ccd935a1522bb70361ccd6d70829862e56.tar.gz hercules-120f66ccd935a1522bb70361ccd6d70829862e56.tar.bz2 hercules-120f66ccd935a1522bb70361ccd6d70829862e56.tar.xz hercules-120f66ccd935a1522bb70361ccd6d70829862e56.zip | |
Fixed Bug#7362, Bug#7363 & Bug#7355
Fixed compilation error and server console error.
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 bc5959003..c2dfebd01 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -3351,7 +3351,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 @@ -3392,8 +3392,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 } } |