summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-06-18 00:45:47 +0200
committerHaru <haru@dotalux.com>2016-06-25 17:29:47 +0200
commitbe570dd88f744efcf837a69901ad60bb1c78fffe (patch)
tree8a14843d3594e310c943f6e2aad271a16193d129 /src/map
parent6ff6b99d6665a387d83018f39dbf88f150338711 (diff)
downloadhercules-be570dd88f744efcf837a69901ad60bb1c78fffe.tar.gz
hercules-be570dd88f744efcf837a69901ad60bb1c78fffe.tar.bz2
hercules-be570dd88f744efcf837a69901ad60bb1c78fffe.tar.xz
hercules-be570dd88f744efcf837a69901ad60bb1c78fffe.zip
Removed the uncommon (and useless) multi-argument variant of mes()
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/map/script.c b/src/map/script.c
index e4c973045..d9487de3b 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -5248,19 +5248,10 @@ const char *script_getfuncname(struct script_state *st) {
BUILDIN(mes)
{
struct map_session_data *sd = script->rid2sd(st);
- if( sd == NULL )
+ if (sd == NULL)
return true;
- if( !script_hasdata(st, 3) ) {// only a single line detected in the script
- clif->scriptmes(sd, st->oid, script_getstr(st, 2));
- } else {// parse multiple lines as they exist
- int i;
-
- for( i = 2; script_hasdata(st, i); i++ ) {
- // send the message to the client
- clif->scriptmes(sd, st->oid, script_getstr(st, i));
- }
- }
+ clif->scriptmes(sd, st->oid, script_getstr(st, 2));
return true;
}
@@ -20354,7 +20345,7 @@ void script_parse_builtin(void) {
BUILDIN_DEF(__setr,"rv?"),
// NPC interaction
- BUILDIN_DEF(mes,"s*"),
+ BUILDIN_DEF(mes,"s"),
BUILDIN_DEF(next,""),
BUILDIN_DEF(close,""),
BUILDIN_DEF(close2,""),