added support for .colormap values >= 1024 in QC to mean direct color specification...

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index aaeb1e5c5c361ac860df8f94070a633139a85b9a..21a4df5c6196e49c2f01f9352260dd21c6309bb0 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -421,7 +421,9 @@ static void CL_RelinkNetworkEntities()
                VectorCopy (neworg, ent->render.origin);
                ent->render.flags = ent->state_current.flags;
                ent->render.effects = effects = ent->state_current.effects;
-               if (cl.scores == NULL || !ent->state_current.colormap)
+               if (ent->state_current.flags & RENDER_COLORMAPPED)
+                       ent->render.colormap = ent->state_current.colormap;
+               else if (cl.scores == NULL || !ent->state_current.colormap)
                        ent->render.colormap = -1; // no special coloring
                else
                        ent->render.colormap = cl.scores[ent->state_current.colormap - 1].colors; // color it