stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-24 10:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make chat aware of team colors on normal chat plus custom team colors

Browse source
This commit is contained in:
Lugent 2025-01-12 11:23:33 -04:00
parent 1bb51b0ed3
commit 201d0fd023
1 changed files with 53 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
src/hu_stuff.c
View file

@ -590,6 +590,45 @@ static void Command_CSay_f(void)
UINT8 spam_tokens[MAXPLAYERS] = { 1 }; // fill the buffer with 1 so the motd can be sent. UINT8 spam_tokens[MAXPLAYERS] = { 1 }; // fill the buffer with 1 so the motd can be sent.
tic_t spam_tics[MAXPLAYERS]; tic_t spam_tics[MAXPLAYERS];
static char *GetChatColorFromSkinColor(INT32 skincolor)
{
const char *textcolor = NULL;
UINT16 chatcolor = skincolors[skincolor].chatcolor;
if (!chatcolor || chatcolor%0x1000 || chatcolor>V_INVERTMAP)
textcolor = "\x80";
else if (chatcolor == V_MAGENTAMAP)
textcolor = "\x81";
else if (chatcolor == V_YELLOWMAP)
textcolor = "\x82";
else if (chatcolor == V_GREENMAP)
textcolor = "\x83";
else if (chatcolor == V_BLUEMAP)
textcolor = "\x84";
else if (chatcolor == V_REDMAP)
textcolor = "\x85";
else if (chatcolor == V_GRAYMAP)
textcolor = "\x86";
else if (chatcolor == V_ORANGEMAP)
textcolor = "\x87";
else if (chatcolor == V_SKYMAP)
textcolor = "\x88";
else if (chatcolor == V_PURPLEMAP)
textcolor = "\x89";
else if (chatcolor == V_AQUAMAP)
textcolor = "\x8a";
else if (chatcolor == V_PERIDOTMAP)
textcolor = "\x8b";
else if (chatcolor == V_AZUREMAP)
textcolor = "\x8c";
else if (chatcolor == V_BROWNMAP)
textcolor = "\x8d";
else if (chatcolor == V_ROSYMAP)
textcolor = "\x8e";
else if (chatcolor == V_INVERTMAP)
textcolor = "\x8f";
return textcolor;
}
/** Receives a message, processing an ::XD_SAY command. /** Receives a message, processing an ::XD_SAY command.
* \sa DoSayCommand * \sa DoSayCommand
* \author Graue <graue@oceanbase.org> * \author Graue <graue@oceanbase.org>
@ -709,51 +748,27 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
{ {
if (players[playernum].ctfteam == 1) // red if (players[playernum].ctfteam == 1) // red
{ {
cstart = "\x85"; cstart = textcolor = GetChatColorFromSkinColor(skincolor_redteam);
textcolor = "\x85";
} }
else // blue else // blue
{ {
cstart = "\x84"; cstart = textcolor = GetChatColorFromSkinColor(skincolor_blueteam);
textcolor = "\x84";
} }
} }
else else
{ {
UINT16 chatcolor = skincolors[players[playernum].skincolor].chatcolor; cstart = GetChatColorFromSkinColor(players[playernum].skincolor);
if (G_GametypeHasTeams())
if (!chatcolor || chatcolor%0x1000 || chatcolor>V_INVERTMAP) {
cstart = "\x80"; if (players[playernum].ctfteam == 1) // red
else if (chatcolor == V_MAGENTAMAP) {
cstart = "\x81"; cstart = GetChatColorFromSkinColor(skincolor_redteam);
else if (chatcolor == V_YELLOWMAP) }
cstart = "\x82"; else // blue
else if (chatcolor == V_GREENMAP) {
cstart = "\x83"; cstart = GetChatColorFromSkinColor(skincolor_blueteam);
else if (chatcolor == V_BLUEMAP) }
cstart = "\x84"; }
else if (chatcolor == V_REDMAP)
cstart = "\x85";
else if (chatcolor == V_GRAYMAP)
cstart = "\x86";
else if (chatcolor == V_ORANGEMAP)
cstart = "\x87";
else if (chatcolor == V_SKYMAP)
cstart = "\x88";
else if (chatcolor == V_PURPLEMAP)
cstart = "\x89";
else if (chatcolor == V_AQUAMAP)
cstart = "\x8a";
else if (chatcolor == V_PERIDOTMAP)
cstart = "\x8b";
else if (chatcolor == V_AZUREMAP)
cstart = "\x8c";
else if (chatcolor == V_BROWNMAP)
cstart = "\x8d";
else if (chatcolor == V_ROSYMAP)
cstart = "\x8e";
else if (chatcolor == V_INVERTMAP)
cstart = "\x8f";
} }
prefix = cstart; prefix = cstart;