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

diff --git a/r_explosion.c b/r_explosion.c
index 63d2f2e2..104a9753 100644
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -43,7 +43,7 @@ typedef struct explosion_s
 	vec3_t origin;
 	vec3_t vert[EXPLOSIONVERTS];
 	vec3_t vertvel[EXPLOSIONVERTS];
-	qboolean clipping;
+	qbool clipping;
 }
 explosion_t;
 
@@ -55,11 +55,11 @@ 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 = {CF_CLIENT | CF_ARCHIVE, "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 = {CF_CLIENT, "r_drawexplosions", "1", "enables rendering of explosion shells (see also cl_particles_explosions_shell)"};
 
-//extern qboolean r_loadfog;
+//extern qbool r_loadfog;
 static void r_explosion_start(void)
 {
 	int x, y;
@@ -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