diff options
| author | Haru <haru@dotalux.com> | 2019-04-07 23:45:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-07 23:45:51 +0200 |
| commit | a3a1e366f479a80d983a0c476c4cdc6ad3643a03 (patch) | |
| tree | c0e5ba9127f858449bae19846f518df9ad9658d0 /src/map/script.c | |
| parent | f89a6da63a50cefa8251d1a84f40d85cf109bd4e (diff) | |
| parent | f61b8dac943cf2c0e3a67659134c424d57064617 (diff) | |
| download | hercules-a3a1e366f479a80d983a0c476c4cdc6ad3643a03.tar.gz hercules-a3a1e366f479a80d983a0c476c4cdc6ad3643a03.tar.bz2 hercules-a3a1e366f479a80d983a0c476c4cdc6ad3643a03.tar.xz hercules-a3a1e366f479a80d983a0c476c4cdc6ad3643a03.zip | |
Merge pull request #2415 from AnnieRuru/76-showscript
Add optional parameter for *showscript to send target to SELF only
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/script.c b/src/map/script.c index bfb7e9d37..fe8638ac3 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -24430,7 +24430,7 @@ static BUILDIN(showscript) { struct block_list *bl = NULL; const char *msg = script_getstr(st, 2); - int id = 0; + int id = 0, flag = AREA; if (script_hasdata(st, 3)) { id = script_getnum(st, 3); @@ -24442,14 +24442,14 @@ static BUILDIN(showscript) if (!bl) { ShowError("buildin_showscript: Script not attached. (id=%d, rid=%d, oid=%d)\n", id, st->rid, st->oid); - script_pushint(st, 0); return false; } - clif->ShowScript(bl, msg); - - script_pushint(st, 1); - + if (script_hasdata(st, 4)) + if (script_getnum(st, 4) == SELF) + flag = SELF; + + clif->ShowScript(bl, msg, flag); return true; } @@ -25875,7 +25875,7 @@ static void script_parse_builtin(void) BUILDIN_DEF(channelmes, "ss"), BUILDIN_DEF(addchannelhandler, "ss"), BUILDIN_DEF(removechannelhandler, "ss"), - BUILDIN_DEF(showscript, "s?"), + BUILDIN_DEF(showscript, "s??"), BUILDIN_DEF(mergeitem,""), BUILDIN_DEF(getcalendartime, "ii??"), |