From 50c79f0312c25de2c5b5e285f9f1635f8b74a4bb Mon Sep 17 00:00:00 2001 From: gumi Date: Sun, 5 Mar 2017 12:34:12 -0500 Subject: allow to use deltimer on another player --- src/map/script.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/map/script.c') diff --git a/src/map/script.c b/src/map/script.c index 3da3ff211..43d1822f1 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -10818,7 +10818,11 @@ BUILDIN(deltimer) struct map_session_data *sd; event=script_getstr(st, 2); - sd = script->rid2sd(st); + + if (script_hasdata(st, 3)) + sd = map->id2sd(script_getnum(st, 3)); + else + sd = script->rid2sd(st); if (sd == NULL) return true; @@ -21098,7 +21102,7 @@ void script_parse_builtin(void) { BUILDIN_DEF(doevent,"s"), BUILDIN_DEF(donpcevent,"s"), BUILDIN_DEF(addtimer,"is?"), - BUILDIN_DEF(deltimer,"s"), + BUILDIN_DEF(deltimer,"s?"), BUILDIN_DEF(addtimercount,"si"), BUILDIN_DEF(initnpctimer,"??"), BUILDIN_DEF(stopnpctimer,"??"), -- cgit v1.2.3-70-g09d2