diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-06-14 01:59:38 -0700 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-06-14 01:59:38 -0700 |
| commit | d663d4d86a2a403764baa0de27af6f9950d9a09f (patch) | |
| tree | 308d84ae13717b93daec98bc079b0d2209715d6f /src/map/npc.c | |
| parent | af26debad8ef2d756e027fa9920ef0f68522d9c9 (diff) | |
| download | hercules-d663d4d86a2a403764baa0de27af6f9950d9a09f.tar.gz hercules-d663d4d86a2a403764baa0de27af6f9950d9a09f.tar.bz2 hercules-d663d4d86a2a403764baa0de27af6f9950d9a09f.tar.xz hercules-d663d4d86a2a403764baa0de27af6f9950d9a09f.zip | |
Fixed Bug#7362, Bug#7363 & Bug#7355
Fixed compilation error and server console error.
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 5e03191e7..f4027096c 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -276,7 +276,7 @@ int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t dat clif->scriptclear(sd,sd->npc_id); sd->npc_idle_timer = INVALID_TIMER; } else //Create a new instance of ourselves to continue - sd->npc_idle_timer = add_timer(gettick() + (SECURE_NPCTIMEOUT_INTERVAL*1000),npc_rr_secure_timeout_timer,sd->bl.id,0); + sd->npc_idle_timer = iTimer->add_timer(iTimer->gettick() + (SECURE_NPCTIMEOUT_INTERVAL*1000),npc_rr_secure_timeout_timer,sd->bl.id,0); return 0; } #endif @@ -1245,7 +1245,7 @@ int npc_scriptcont(struct map_session_data* sd, int id, bool closing) /** * Update the last NPC iteration **/ - sd->npc_idle_tick = gettick(); + sd->npc_idle_tick = iTimer->gettick(); #endif /** |