lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bruh.

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)