diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-10 15:25:24 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-10 15:25:24 +0000 |
| commit | f4d39edff58dc2a8db9e517a6ffbe738e36b31e9 (patch) | |
| tree | 8439f43fc788c0df4fb5b412a7a8cfe828cb9368 /src/map/npc.c | |
| parent | 2ef5d159733a6d8ee3fd3ff2d9c887874acc3b5f (diff) | |
| download | hercules-f4d39edff58dc2a8db9e517a6ffbe738e36b31e9.tar.gz hercules-f4d39edff58dc2a8db9e517a6ffbe738e36b31e9.tar.bz2 hercules-f4d39edff58dc2a8db9e517a6ffbe738e36b31e9.tar.xz hercules-f4d39edff58dc2a8db9e517a6ffbe738e36b31e9.zip | |
* Completed adding packet DB reading
* Added Shinomori's suggestions for npc timers,
* Removed checking for script event timers' length, and added Shinomori's changes
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@947 54d463be-8e91-2dee-dedb-b68131a5f0ec
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 d2379e5a8..ff752192a 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -589,7 +589,7 @@ int npc_timerevent(int tid,unsigned int tick,int id,int data) nd->u.scr.timerid = add_timer(tick+next,npc_timerevent,id,next); } - run_script(nd->u.scr.script,te->pos,nd->u.scr.timerrid,nd->bl.id); + run_script(nd->u.scr.script,te->pos,nd->u.scr.rid,nd->bl.id); return 0; } /*========================================== @@ -612,7 +612,7 @@ int npc_timerevent_start(struct npc_data *nd) } nd->u.scr.nexttimer=j; nd->u.scr.timertick=gettick(); - nd->u.scr.timerrid=0; // no players attached by default [celest] + nd->u.scr.rid=0; // reset attached player [celest] if(j>=n) return 0; |