334

[xonotic/darkplaces.git] / gl_models.c

diff --git a/gl_models.c b/gl_models.c
index 5bd5f03e7d75d155d65201959d8b1e68fc9eb590..509a535baae9af34f39851f7852baa3bd331e625 100644 (file)
--- a/gl_models.c
+++ b/gl_models.c
@@ -17,7 +17,7 @@ aliasskin_t *R_FetchAliasSkin(const entity_render_t *ent, const aliasmesh_t *mes
                if ((unsigned int)s >= (unsigned int)model->numskins)
                        s = 0;
                if (model->skinscenes[s].framecount > 1)
-                       s = model->skinscenes[s].firstframe + (int) (cl.time * model->skinscenes[s].framerate) % model->skinscenes[s].framecount;
+                       s = model->skinscenes[s].firstframe + (int) (r_refdef.time * model->skinscenes[s].framerate) % model->skinscenes[s].framecount;
                else
                        s = model->skinscenes[s].firstframe;
                if (s >= mesh->num_skins)
@@ -144,6 +144,9 @@ void R_DrawAliasModelCallback (const void *calldata1, int calldata2)
                        }
                        else
                                tint[0] = tint[1] = tint[2] = 1;
+                       tint[0] *= ent->colormod[0];
+                       tint[1] *= ent->colormod[1];
+                       tint[2] *= ent->colormod[2];
                        if (!fullbright && !(ent->flags & RENDER_TRANSPARENT))
                                colorscale *= r_lightmapintensity;
                        colorscale *= ifog;