Added the togglemenu command for both menus and the chr builtin command (menu qc)

[xonotic/darkplaces.git] / r_explosion.c

diff --git a/r_explosion.c b/r_explosion.c
index 23a44c6db572e1f71d733f8bf9a5298a5681ad27..45b7f5ce12b336a5489651bbb27eb809ab8ae4ae 100644 (file)
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -187,7 +187,7 @@ void R_DrawExplosionCallback(const void *calldata1, int calldata2)
 
        numtriangles = EXPLOSIONTRIS;
        numverts = EXPLOSIONVERTS;
-       alpha = e->alpha * r_colorscale;
+       alpha = e->alpha;
        GL_Color(alpha, alpha, alpha, 1);
        GL_VertexPointer(e->vert[0]);
 
@@ -222,7 +222,7 @@ void R_MoveExplosion(explosion_t *e)
                        VectorMA(e->vert[i], frametime, e->vertvel[i], end);
                        if (r_explosionclip.integer)
                        {
-                               if (CL_TraceLine(e->vert[i], end, impact, normal, 0, true, NULL) < 1)
+                               if (CL_TraceLine(e->vert[i], end, impact, normal, true, NULL, SUPERCONTENTS_SOLID) < 1)
                                {
                                        // clip velocity against the wall
                                        dot = DotProduct(e->vertvel[i], normal) * -1.125f;