summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-11 14:52:10 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-11 14:52:10 +0000
commit75b03a564ace1deb3956da35bb0bffd52b3c181b (patch)
tree6ee413fa3524f79709f3bdefe8849ccf918c9853 /src/map/script.c
parent0993cb85ba53417a179a0fc8b315e58d2d3a32d5 (diff)
downloadhercules-75b03a564ace1deb3956da35bb0bffd52b3c181b.tar.gz
hercules-75b03a564ace1deb3956da35bb0bffd52b3c181b.tar.bz2
hercules-75b03a564ace1deb3956da35bb0bffd52b3c181b.tar.xz
hercules-75b03a564ace1deb3956da35bb0bffd52b3c181b.zip
Added Shinomori's changes to npc event timers
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@953 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 64e4a7692..a6b65e213 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3892,8 +3892,7 @@ int buildin_initnpctimer(struct script_state *st)
nd=(struct npc_data *)map_id2bl(st->oid);
npc_settimerevent_tick(nd,0);
- npc_timerevent_start(nd);
- nd->u.scr.rid=st->rid;
+ npc_timerevent_start(nd, st->rid);
return 0;
}
/*==========================================
@@ -3908,7 +3907,7 @@ int buildin_startnpctimer(struct script_state *st)
else
nd=(struct npc_data *)map_id2bl(st->oid);
- npc_timerevent_start(nd);
+ npc_timerevent_start(nd, st->rid);
return 0;
}
/*==========================================