Merge pull request #2193 from Helianthella/mes

buildin_mes shorthand
HerculesWS · Sep 24, 2018 · 0bce86f · 0bce86f
2 parents fadc4ec + c5ecaaa
commit 0bce86f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/map/script.c b/src/map/script.c
@@ -5965,10 +5965,14 @@ static bool script_sprintf_helper(struct script_state *st, int start, struct Str
 static BUILDIN(mes)
 {
 	struct map_session_data *sd = script->rid2sd(st);
+
 	if (sd == NULL)
 		return true;
 
-	clif->scriptmes(sd, st->oid, script_getstr(st, 2));
+	if (script_hasdata(st, 2))
+		clif->scriptmes(sd, st->oid, script_getstr(st, 2));
+	else
+		clif->scriptmes(sd, st->oid, "");
 
 	return true;
 }
@@ -24960,8 +24964,8 @@ static void script_parse_builtin(void)
 		BUILDIN_DEF(__setr,"rv?"),
 
 		// NPC interaction
-		BUILDIN_DEF(mes,"s"),
-		BUILDIN_DEF(mesf,"s*"),
+		BUILDIN_DEF(mes, "?"),
+		BUILDIN_DEF(mesf, "s*"),
 		BUILDIN_DEF(next,""),
 		BUILDIN_DEF(close,""),
 		BUILDIN_DEF(close2,""),