diff options
| author | Haruna <haru@dotalux.com> | 2015-07-08 03:39:36 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2015-07-08 03:39:36 +0200 |
| commit | 041e0625b543215e8b319fc4ef32fa24cd199656 (patch) | |
| tree | 4f36abbb84364ad48c53f1f8bc6db007b01a20f6 /src/map/script.c | |
| parent | 5fd40de233d3a897284f771338cbf8e657182261 (diff) | |
| parent | 856b6f1feb25ca74d716a4c22fff650e0ff065a0 (diff) | |
| download | hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.gz hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.bz2 hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.xz hercules-041e0625b543215e8b319fc4ef32fa24cd199656.zip | |
Merge pull request #586 from hemagx/master
Update UID system to match official and Implement Merger
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/map/script.c b/src/map/script.c index 47ac151ed..f2fce3a8f 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -19691,6 +19691,17 @@ BUILDIN(showscript) { return true; } +BUILDIN(mergeitem) +{ + struct map_session_data *sd = script->rid2sd(st); + + if (sd == NULL) + return true; + + clif->openmergeitem(sd->fd, sd); + + return true; +} /** place holder for the translation macro **/ BUILDIN(_) { return true; @@ -20329,6 +20340,7 @@ void script_parse_builtin(void) { BUILDIN_DEF(channelmes, "ss"), BUILDIN_DEF(showscript, "s?"), + BUILDIN_DEF(mergeitem,""), BUILDIN_DEF(_,"s"), }; int i, len = ARRAYLENGTH(BUILDIN); |