diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-10 10:16:06 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-10 10:16:06 +0000 |
| commit | 7536331ae203d5576166cd50a3243b735cd30f75 (patch) | |
| tree | 2cf87c8b716d5ce273c5d21de1320c2509124124 /src/map/npc.c | |
| parent | 31840066c4795124a887cd12996cf7dc13fcef25 (diff) | |
| download | hercules-7536331ae203d5576166cd50a3243b735cd30f75.tar.gz hercules-7536331ae203d5576166cd50a3243b735cd30f75.tar.bz2 hercules-7536331ae203d5576166cd50a3243b735cd30f75.tar.xz hercules-7536331ae203d5576166cd50a3243b735cd30f75.zip | |
* Fixed some typos and exploits in the Blacksmith and Hunter job quest
* Modified 'wedding' script command to work with "OnTimer" scripts
* Added 'attachnpctimer' and 'detachnpctimer' script command
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@944 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 4ef38ff52..d2379e5a8 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,0,nd->bl.id); + run_script(nd->u.scr.script,te->pos,nd->u.scr.timerrid,nd->bl.id); return 0; } /*========================================== @@ -612,6 +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] if(j>=n) return 0; |