From 996521cc34ae592eb6f43ad2e8809caa72d07c60 Mon Sep 17 00:00:00 2001 From: Shpoike Date: Wed, 22 Jun 2022 06:57:57 +0100 Subject: [PATCH] Fix up player colours a smidge. --- Quake/cl_demo.c | 4 ++-- Quake/cl_main.c | 3 ++- Quake/gl_texmgr.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Quake/cl_demo.c b/Quake/cl_demo.c index 33670397..5e08a838 100644 --- a/Quake/cl_demo.c +++ b/Quake/cl_demo.c @@ -344,9 +344,9 @@ void CL_Record_Spawn(void) MSG_WriteByte (&net_message, i); c = 0; 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) - c |= (cl.scores[i].pants.rgb[0]<<0)&0xf; + c |= (cl.scores[i].pants.basic<<0)&0xf; MSG_WriteByte (&net_message, c); } diff --git a/Quake/cl_main.c b/Quake/cl_main.c index 99864776..4f6f5a14 100644 --- a/Quake/cl_main.c +++ b/Quake/cl_main.c @@ -1422,7 +1422,8 @@ plcolour_t CL_PLColours_Parse(const char *s) else { 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; } diff --git a/Quake/gl_texmgr.c b/Quake/gl_texmgr.c index a2b42c2b..cf465d4a 100644 --- a/Quake/gl_texmgr.c +++ b/Quake/gl_texmgr.c @@ -1380,7 +1380,7 @@ static void TexMgr_LoadImage8 (gltexture_t *glt, byte *data) } else if (glt->shirt.type == 1) { - shirt = glt->shirt.rgb[0] * 16; + shirt = glt->shirt.basic * 16; if (shirt < 128) { for (i = 0; i < 16; i++)