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/npc.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/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 /** |