summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/map/script.c8
1 files changed, 6 insertions, 2 deletions
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,"??"),