summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-03-28 00:06:45 +0100
committerKenpachi Developer <Kenpachi.Developer@gmx.de>2020-03-28 00:06:45 +0100
commitc9a5b5756469661c26e469390980472aac072510 (patch)
tree40f69422f59fbf032faf9eda030d594313af087f /src/map/script.c
parentdd7f653b00239299cdecb7ca826c21e5957863da (diff)
downloadhercules-c9a5b5756469661c26e469390980472aac072510.tar.gz
hercules-c9a5b5756469661c26e469390980472aac072510.tar.bz2
hercules-c9a5b5756469661c26e469390980472aac072510.tar.xz
hercules-c9a5b5756469661c26e469390980472aac072510.zip
Add optional paramter <account id> to setpcblock() script command
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c
index b8a7979a7..45c1d125e 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -19267,7 +19267,7 @@ static BUILDIN(pcblockmove)
static BUILDIN(setpcblock)
{
- struct map_session_data *sd = script->rid2sd(st);
+ struct map_session_data *sd = script_hasdata(st, 4) ? script->id2sd(st, script_getnum(st, 4)) : script->rid2sd(st);
enum pcblock_action_flag type = script_getnum(st, 2);
int state = (script_getnum(st, 3) > 0) ? 1 : 0;
@@ -27085,7 +27085,7 @@ static void script_parse_builtin(void)
BUILDIN_DEF(pcfollow,"ii"),
BUILDIN_DEF(pcstopfollow,"i"),
BUILDIN_DEF_DEPRECATED(pcblockmove,"ii"), // Deprecated 2018-05-04
- BUILDIN_DEF(setpcblock, "ii"),
+ BUILDIN_DEF(setpcblock, "ii?"),
BUILDIN_DEF(checkpcblock, ""),
// <--- [zBuffer] List of player cont commands
// [zBuffer] List of mob control commands --->