qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-18 09:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix colormap and colormod.

Browse source 
Fitzquake doesn't support colormod, so it needs to be copied from baseline
at all times.

colormap was just a thinko/typo.
This commit is contained in:
Bill Currie 2012-06-28 14:36:05 +09:00
parent e41d269617
commit 0d8cd72a89
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nq/source/cl_ents.c
View file

@ -599,9 +599,9 @@ CL_RelinkEntities (void)
set_entity_model (ent, new->modelindex); set_entity_model (ent, new->modelindex);
} }
ent->frame = new->frame; ent->frame = new->frame;
if (cl_forcelink[i] || new->colormod != old->colormod) { if (cl_forcelink[i] || new->colormap != old->colormap) {
old->colormod = new->colormod; old->colormap = new->colormap;
ent->skin = mod_funcs->Skin_SetColormap (ent->skin, new->colormod); ent->skin = mod_funcs->Skin_SetColormap (ent->skin, new->colormap);
} }
if (cl_forcelink[i] || new->skinnum != old->skinnum) { if (cl_forcelink[i] || new->skinnum != old->skinnum) {
old->skinnum = new->skinnum; old->skinnum = new->skinnum;

1
nq/source/cl_parse.c
View file

@ -568,6 +568,7 @@ CL_ParseUpdate (int bits)
if (bits & U_LERPFINISH) { if (bits & U_LERPFINISH) {
MSG_ReadByte (net_message); //FIXME ignored for now. see fitzquake MSG_ReadByte (net_message); //FIXME ignored for now. see fitzquake
} }
state->colormod = baseline->colormod;
} else { } else {
state->alpha = baseline->alpha; state->alpha = baseline->alpha;
state->scale = baseline->scale; state->scale = baseline->scale;