X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=r_explosion.c;h=b60bfc2d0f56cbc40da6d4b553bd2bccc0f856fe;hb=4ab0ac6b4c6aaa550714643af2f0f8d514e90cb3;hp=63d2f2e28e3ccede077e1b5005bd5aeb4c8c1239;hpb=2af7bf1a4eb9a5c9a1cfe76f9f8690523bafbd3e;p=xonotic%2Fdarkplaces.git

diff --git a/r_explosion.c b/r_explosion.c
index 63d2f2e2..b60bfc2d 100644
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -55,9 +55,9 @@ static rtexture_t	*explosiontexture;
 static rtexturepool_t	*explosiontexturepool;
 #endif
 
-cvar_t r_explosionclip = {CVAR_SAVE, "r_explosionclip", "1", "enables collision detection for explosion shell (so that it flattens against walls and floors)"};
+cvar_t r_explosionclip = {CVAR_CLIENT | CVAR_SAVE, "r_explosionclip", "1", "enables collision detection for explosion shell (so that it flattens against walls and floors)"};
 #ifdef MAX_EXPLOSIONS
-static cvar_t r_drawexplosions = {0, "r_drawexplosions", "1", "enables rendering of explosion shells (see also cl_particles_explosions_shell)"};
+static cvar_t r_drawexplosions = {CVAR_CLIENT, "r_drawexplosions", "1", "enables rendering of explosion shells (see also cl_particles_explosions_shell)"};
 
 //extern qboolean r_loadfog;
 static void r_explosion_start(void)
@@ -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, 0, collision_extendmovelength.value, true, false, NULL, false, false);
+					trace = CL_TraceLine(e->origin, e->vert[j], MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, 0, 0, collision_extendmovelength.value, 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, false, false, false);
+	R_SetupShader_Generic(explosiontexture, false, 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, 0, collision_extendmovelength.value, true, false, NULL, false, false);
+				trace = CL_TraceLine(e->vert[i], end, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, 0, 0, collision_extendmovelength.value, true, false, NULL, false, false);
 				if (trace.fraction < 1)
 				{
 					// clip velocity against the wall