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

Bruh.

Browse source
This commit is contained in:
SwitchKaze 2020-02-29 23:44:56 -05:00
parent 21b28b6295
commit fd4666b481
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/hu_stuff.c
View file

@ -759,7 +759,6 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
}
else
{
<<<<<<< HEAD
UINT16 chatcolor = skincolors[players[playernum].skincolor].chatcolor;
if (!chatcolor || chatcolor%0x1000 || chatcolor>V_INVERTMAP)