qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 23:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix team colors in GL NQ.

Browse source
This commit is contained in:
Bill Currie 2012-01-26 13:53:52 +09:00
parent ae4a30089e
commit ca2c861671
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/models/gl_skin.c
View file

@ -234,8 +234,16 @@ Skin_SetupSkin (skin_t *skin, int cmap)
s = skins + cmap; s = skins + cmap;
changed = (s->tex != skin->texels); changed = (s->tex != skin->texels);
s->tex = skin->texels; s->tex = skin->texels;
if (!changed) if (!changed) {
skin->texnum = 0;
skin->auxtex = 0;
if (cmap >= 0) {
skin->texnum = skin_textures + cmap;
if (s->fb)
skin->auxtex = skin_fb_textures + cmap;
}
return; return;
}
do_fb_skin (s); do_fb_skin (s);
build_skin (skin, cmap); build_skin (skin, cmap);
} }

4
nq/source/cl_parse.c
View file

@ -1019,9 +1019,9 @@ CL_ParseServerMessage (void)
entity_t *ent = &cl_entities[i+1]; entity_t *ent = &cl_entities[i+1];
byte col = MSG_ReadByte (net_message); byte col = MSG_ReadByte (net_message);
if (col != cl.scores[i].colors) if (col != cl.scores[i].colors)
Skin_SetTranslation (i, col >> 4, col & 0xf); Skin_SetTranslation (i + 1, col >> 4, col & 0xf);
cl.scores[i].colors = col; cl.scores[i].colors = col;
ent->skin = Skin_SetColormap (ent->skin, i); ent->skin = Skin_SetColormap (ent->skin, i + 1);
} }
break; break;