Fix up player colours a smidge.

This commit is contained in:
Shpoike 2022-06-22 06:57:57 +01:00
parent 334931c65e
commit 996521cc34
3 changed files with 5 additions and 4 deletions

View file

@ -344,9 +344,9 @@ void CL_Record_Spawn(void)
MSG_WriteByte (&net_message, i); MSG_WriteByte (&net_message, i);
c = 0; c = 0;
if (cl.scores[i].shirt.type == 1) if (cl.scores[i].shirt.type == 1)
c |= (cl.scores[i].shirt.rgb[0]<<4)&0xf; c |= (cl.scores[i].shirt.basic<<4)&0xf;
if (cl.scores[i].pants.type == 1) if (cl.scores[i].pants.type == 1)
c |= (cl.scores[i].pants.rgb[0]<<0)&0xf; c |= (cl.scores[i].pants.basic<<0)&0xf;
MSG_WriteByte (&net_message, c); MSG_WriteByte (&net_message, c);
} }

View file

@ -1422,7 +1422,8 @@ plcolour_t CL_PLColours_Parse(const char *s)
else else
{ {
c.type = 0; c.type = 0;
c.rgb[0] = c.rgb[1] = c.rgb[2] = 0; c.basic = 0;
c.rgb[0] = c.rgb[1] = c.rgb[2] = 0xff;
} }
return c; return c;
} }

View file

@ -1380,7 +1380,7 @@ static void TexMgr_LoadImage8 (gltexture_t *glt, byte *data)
} }
else if (glt->shirt.type == 1) else if (glt->shirt.type == 1)
{ {
shirt = glt->shirt.rgb[0] * 16; shirt = glt->shirt.basic * 16;
if (shirt < 128) if (shirt < 128)
{ {
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)