fixed a bug with cl_movement prediction being applied during demo playback

[xonotic/darkplaces.git] / r_explosion.c

diff --git a/r_explosion.c b/r_explosion.c
index 6f2c36eceb41b265d0db37af50e479ebac120432..a504dd3036ccc003a219fb9d0738bb338eec1530 100644 (file)
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -188,6 +188,7 @@ static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, cons
        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
        GL_DepthMask(false);
        GL_DepthTest(true);
+       GL_CullFace(GL_FRONT); // quake is backwards, this culls back faces
        R_Mesh_Matrix(&identitymatrix);
 
        R_Mesh_ColorPointer(NULL);
@@ -199,7 +200,8 @@ static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, cons
        {
                const explosion_t *e = explosion + surfacelist[surfacelistindex];
                R_Mesh_VertexPointer(e->vert[0]);
-               GL_Color(e->alpha, e->alpha, e->alpha, 1);
+               // FIXME: fixed function path can't properly handle r_view.colorscale > 1
+               GL_Color(e->alpha * r_view.colorscale, e->alpha * r_view.colorscale, e->alpha * r_view.colorscale, 1);
                GL_LockArrays(0, numverts);
                R_Mesh_Draw(0, numverts, numtriangles, explosiontris[0]);
                GL_LockArrays(0, 0);