diff options
| author | Haru <haru@dotalux.com> | 2018-08-24 23:21:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 23:21:00 +0200 |
| commit | cc25a7c300ab2f549d4f2760eafb0baaf7e032d5 (patch) | |
| tree | 3691382e27792e6eb7b5c9e5fd5d604d5d479446 /src/map/script.c | |
| parent | b055e906a0941a6c07e8366a5cf9a559a37b52cf (diff) | |
| parent | bfdbfaadddf66d2eaa7b21cc5d7568aab1f3fc56 (diff) | |
| download | hercules-cc25a7c300ab2f549d4f2760eafb0baaf7e032d5.tar.gz hercules-cc25a7c300ab2f549d4f2760eafb0baaf7e032d5.tar.bz2 hercules-cc25a7c300ab2f549d4f2760eafb0baaf7e032d5.tar.xz hercules-cc25a7c300ab2f549d4f2760eafb0baaf7e032d5.zip | |
Merge pull request #2176 from 4144/updatepackets
Update packets to 2018-08-08
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/src/map/script.c b/src/map/script.c index cba844c1a..c40137c55 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -24689,6 +24689,44 @@ static BUILDIN(openstylist) return true; } +static BUILDIN(msgtable) +{ + struct map_session_data *sd = script_rid2sd(st); + if (sd == NULL) + return false; + + const enum clif_messages msgId = script_getnum(st, 2); + if (script_hasdata(st, 3)) { + clif->msgtable_color(sd, msgId, script_getnum(st, 3)); + } else { + clif->msgtable(sd, msgId); + } + + return true; +} + +static BUILDIN(msgtable2) +{ + struct map_session_data *sd = script_rid2sd(st); + if (sd == NULL) + return false; + + const enum clif_messages msgId = script_getnum(st, 2); + if (script_isstringtype(st, 3)) { + const char *value = script_getstr(st, 3); + if (script_hasdata(st, 4)) { + clif->msgtable_str_color(sd, msgId, value, script_getnum(st, 4)); + } else { + clif->msgtable_str(sd, msgId, value); + } + } else { + const int value = script_getnum(st, 3); + clif->msgtable_num(sd, msgId, value); + } + + return true; +} + /** * Adds a built-in script function. * @@ -25265,6 +25303,8 @@ static void script_parse_builtin(void) BUILDIN_DEF(buyingstore,"i"), BUILDIN_DEF(searchstores,"ii"), BUILDIN_DEF(showdigit,"i?"), + BUILDIN_DEF(msgtable, "i?"), + BUILDIN_DEF(msgtable2, "iv?"), // WoE SE BUILDIN_DEF(agitstart2,""), BUILDIN_DEF(agitend2,""), |