Merge pull request #207 from mekolat/scriptmsg

implement SMSG_SCRIPT_MESSAGE, SMSG_PLAYER_CLIENT_COMMAND

1 files changed, 38 insertions, 0 deletions

diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index fe5a961..07076d5 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -2950,6 +2950,42 @@ void builtin_title(ScriptState *st)
 }
 
 static
+void builtin_smsg(ScriptState *st)
+{
+    dumb_ptr<map_session_data> sd = script_rid2sd(st);
+    if (HARG(2))
+    {
+        CharName player = stringish<CharName>(ZString(conv_str(st, &AARG(2))));
+        sd = map_nick2sd(player);
+    }
+
+    int type = HARG(1) ? conv_num(st, &AARG(0)) : 0;
+    ZString msg = ZString(conv_str(st, (HARG(1) ? &AARG(1) : &AARG(0))));
+    if (sd == nullptr)
+        return;
+    if (type < 0 || type > 0xFF)
+        type = 0;
+
+    clif_server_message(sd, type, msg);
+}
+
+static
+void builtin_remotecmd(ScriptState *st)
+{
+    dumb_ptr<map_session_data> sd = script_rid2sd(st);
+    if (HARG(1))
+    {
+        CharName player = stringish<CharName>(ZString(conv_str(st, &AARG(1))));
+        sd = map_nick2sd(player);
+    }
+
+    ZString msg = ZString(conv_str(st, &AARG(0)));
+    if (sd == nullptr)
+        return;
+    clif_remote_command(sd, msg);
+}
+
+static
 void builtin_music(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
@@ -3490,6 +3526,8 @@ BuiltinFunction builtin_functions[] =
     BUILTIN(message, "Ps"_s, '\0'),
     BUILTIN(npctalk, "ss?"_s, '\0'),
     BUILTIN(title, "s"_s, '\0'),
+    BUILTIN(smsg, "e??"_s, '\0'),
+    BUILTIN(remotecmd, "s?"_s, '\0'),
     BUILTIN(music, "s"_s, '\0'),
     BUILTIN(mapmask, "i?"_s, '\0'),
     BUILTIN(getmask, ""_s, 'i'),