diff options
author | mekolat <mekolat@users.noreply.github.com> | 2016-04-14 11:08:39 -0400 |
---|---|---|
committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-14 18:41:58 -0400 |
commit | d5e9d1ecbee0f7540acbe4343bd68e6482e8394a (patch) | |
tree | d317db091afe21e19040199c4ef7bf585f13ce95 /src | |
parent | f54f335c541ecb61f9e9888848eb21b8d43877b7 (diff) | |
download | tmwa-d5e9d1ecbee0f7540acbe4343bd68e6482e8394a.tar.gz tmwa-d5e9d1ecbee0f7540acbe4343bd68e6482e8394a.tar.bz2 tmwa-d5e9d1ecbee0f7540acbe4343bd68e6482e8394a.tar.xz tmwa-d5e9d1ecbee0f7540acbe4343bd68e6482e8394a.zip |
implement SMSG_SCRIPT_MESSAGE
Diffstat (limited to 'src')
-rw-r--r-- | src/map/clif.cpp | 20 | ||||
-rw-r--r-- | src/map/clif.hpp | 1 | ||||
-rw-r--r-- | src/map/script-fun.cpp | 23 |
3 files changed, 44 insertions, 0 deletions
diff --git a/src/map/clif.cpp b/src/map/clif.cpp index 386ac63..bf20b57 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -3886,6 +3886,26 @@ void clif_npc_send_title(Session *s, BlockId npcid, XString msg) send_buffer(s, buf); } +void clif_server_message(dumb_ptr<map_session_data> sd, uint8_t type, XString msg) +{ + nullpo_retv(sd); + + size_t msg_len = msg.size() + 8; + if (msg_len > 512) + return; + + // for newer clients + Packet_Head<0x0229> head_229; + head_229.message_type = type; + Buffer buf = create_vpacket<0x0229, 5, 1>(head_229, msg); + + // falback for older clients + Packet_Head<0x008d> head_8d; + Buffer altbuf = create_vpacket<0x008d, 8, 1>(head_8d, msg); + + clif_send(buf, sd, SendWho::SELF, wrap<ClientVersion>(5), altbuf); +} + void clif_change_music(dumb_ptr<map_session_data> sd, XString music) { nullpo_retv(sd); diff --git a/src/map/clif.hpp b/src/map/clif.hpp index 28f58a9..c339cfd 100644 --- a/src/map/clif.hpp +++ b/src/map/clif.hpp @@ -105,6 +105,7 @@ void clif_sitnpc_towards(dumb_ptr<map_session_data> sd, dumb_ptr<npc_data> nd, D void clif_setnpcdirection(dumb_ptr<npc_data> nd, DIR direction); void clif_setnpcdirection_towards(dumb_ptr<map_session_data> sd, dumb_ptr<npc_data> nd, DIR direction); void clif_npc_send_title(Session *s, BlockId npcid, XString msg); +void clif_server_message(dumb_ptr<map_session_data>, uint8_t, XString msg); void clif_change_music(dumb_ptr<map_session_data> sd, XString music); void clif_npc_action(dumb_ptr<map_session_data>, BlockId, short, int, short, short); void clif_send_mask(dumb_ptr<map_session_data>, int); diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index fe5a961..0d211a7 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -2950,6 +2950,28 @@ 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); + if (sd == nullptr) + return; + } + + 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_music(ScriptState *st) { dumb_ptr<map_session_data> sd = script_rid2sd(st); @@ -3490,6 +3512,7 @@ BuiltinFunction builtin_functions[] = BUILTIN(message, "Ps"_s, '\0'), BUILTIN(npctalk, "ss?"_s, '\0'), BUILTIN(title, "s"_s, '\0'), + BUILTIN(smsg, "e??"_s, '\0'), BUILTIN(music, "s"_s, '\0'), BUILTIN(mapmask, "i?"_s, '\0'), BUILTIN(getmask, ""_s, 'i'), |