vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Menu-FN: Broadcast in Chat when a player is joining a server, and handle ACTION (/me) text output

Browse source
This commit is contained in:
Marco Cawthorne 2023-11-18 15:47:37 -08:00
parent af4212987f
commit faba64ad28
Signed by: eukara
GPG key ID: CE2032F0A2882A22
2 changed files with 51 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/menu-fn/m_chatrooms.qc
View file

@ -213,6 +213,50 @@ irc_decode_colors(string msg)
return ret; return ret;
} }
void
cr_message_wrap(string src, string out, bool isSelf)
{
vector color1, color2;
string noColorOut = strdecolorize(out);
bool isAction = (substring(noColorOut, 0, 6) == "ACTION") ? true : false;
if (isSelf) {
color1 = [128, 100, 0];
color2 = [180, 128, 55];
} else {
color1 = [192, 192, 192];
color2 = [255, 255, 255];
}
/* is this a normal message? */
if (isAction == false) {
string finalOutput = irc_decode_colors(out);
cr_print(
sprintf("%s<%s>%s %s",
Colors_RGB255_to_HEX(color1),
src,
Colors_RGB255_to_HEX(color2),
finalOutput
)
);
memfree((__variant *)finalOutput);
} else {
out = substring(out, 8, -1);
cr_print(
sprintf("%s%s %s",
Colors_RGB255_to_HEX(color1),
src,
out
)
);
}
localcmd(sprintf("_fnchat_msg \"^2[Chat-room] ^7%s^7: %s\"\n", src, out));
}
/* irc processing functions */ /* irc processing functions */
void void
irc_receive(string buffer) irc_receive(string buffer)
@ -251,17 +295,7 @@ irc_receive(string buffer)
switch (argv(2)) { switch (argv(2)) {
case "PRIVMSG": /* a message */ case "PRIVMSG": /* a message */
string msg = substring(buffer, strstrofs(buffer, ":", 1) + 1, -1); string msg = substring(buffer, strstrofs(buffer, ":", 1) + 1, -1);
string out = irc_decode_colors(msg); cr_message_wrap(src, msg, false);
cr_print(
sprintf("%s<%s>%s %s",
Colors_RGB255_to_HEX([192,192,192]),
src,
Colors_RGB255_to_HEX([255,255,255]),
out
)
);
localcmd(sprintf("_fnchat_msg \"^2[Chat-room] ^7%s^7: %s\"\n", src, out));
memfree((__variant *)out);
break; break;
case "321": case "321":
crl_clearrooms(); crl_clearrooms();
@ -367,14 +401,7 @@ cr_input_enter(string text)
if (!g_ircroom.m_iStatus || TCP_GetState(&tcp_irc) != STATE_CONNECTED) if (!g_ircroom.m_iStatus || TCP_GetState(&tcp_irc) != STATE_CONNECTED)
return; return;
cr_print( cr_message_wrap(g_ircroom.m_strNick, text, true);
sprintf("%s<%s>%s %s",
Colors_RGB255_to_HEX([128,100,0]),
g_ircroom.m_strNick,
Colors_RGB255_to_HEX([180,128,55]),
text
)
);
irc_send(sprintf("PRIVMSG %s :%s\n", g_ircroom.m_strChannel, text)); irc_send(sprintf("PRIVMSG %s :%s\n", g_ircroom.m_strChannel, text));
cr_tbInput.SetText(""); cr_tbInput.SetText("");

5
src/menu-fn/m_internetgames.qc
View file

@ -45,10 +45,15 @@ void
inet_btnjoin(void) inet_btnjoin(void)
{ {
string addr = inet_lbServers_Addresses.GetSelectedItem(); string addr = inet_lbServers_Addresses.GetSelectedItem();
string mapName = inet_lbServers_Map.GetSelectedItem();
string hostName = strdecolorize(inet_lbServers_Name.GetSelectedItem());
if (addr) { if (addr) {
localcmd("stopmusic\n"); localcmd("stopmusic\n");
localcmd(sprintf("connect %s\n", addr)); localcmd(sprintf("connect %s\n", addr));
cr_input_enter(sprintf("ACTION is connecting to '%s' on the map %s\n", hostName, mapName));
RichPresence_Clear(); RichPresence_Clear();
RichPresence_Set("connect", strcat("+connect ", addr)); RichPresence_Set("connect", strcat("+connect ", addr));
g_menupage = PAGE_MULTIPLAYER; g_menupage = PAGE_MULTIPLAYER;