X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=r_explosion.c;h=2a45c215b94f9780a9dfee73156fbc804014a878;hb=1b6062f6c60a2525501e1133052d87307ee02e36;hp=5ed511057be67b4a18fb181dc4bc975bd7e4afa0;hpb=7ac7e86b81c449961393d5226f5aa04aac5d31d5;p=xonotic%2Fdarkplaces.git diff --git a/r_explosion.c b/r_explosion.c index 5ed51105..2a45c215 100644 --- a/r_explosion.c +++ b/r_explosion.c @@ -189,7 +189,7 @@ void R_NewExplosion(const vec3_t org) // clip start origin if (e->clipping) { - trace = CL_TraceLine(e->origin, e->vert[j], MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false); + trace = CL_TraceLine(e->origin, e->vert[j], MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false, false); VectorCopy(trace.endpos, e->vert[i]); } } @@ -213,7 +213,7 @@ static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, cons R_EntityMatrix(&identitymatrix); // R_Mesh_ResetTextureState(); - R_SetupShader_Generic(explosiontexture, NULL, GL_MODULATE, 1); + R_SetupShader_Generic(explosiontexture, NULL, GL_MODULATE, 1, false, false); for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) { const explosion_t *e = explosion + surfacelist[surfacelistindex]; @@ -245,7 +245,7 @@ static void R_MoveExplosion(explosion_t *e) VectorMA(e->vert[i], frametime, e->vertvel[i], end); if (e->clipping) { - trace = CL_TraceLine(e->vert[i], end, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false); + trace = CL_TraceLine(e->vert[i], end, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false, false); if (trace.fraction < 1) { // clip velocity against the wall