removed all 3 uses of the brown-text message prefix in the server

[xonotic/darkplaces.git] / r_explosion.c

diff --git a/r_explosion.c b/r_explosion.c
index 000fc692a9863123e98465221724442a0e969028..a486f42de11d42bb419728ac619240b218850411 100644 (file)
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -52,8 +52,8 @@ static rtexture_t     *explosiontexturefog;
 
 static rtexturepool_t  *explosiontexturepool;
 
-cvar_t r_explosionclip = {CVAR_SAVE, "r_explosionclip", "1"};
-static cvar_t r_drawexplosions = {0, "r_drawexplosions", "1"};
+cvar_t r_explosionclip = {CVAR_SAVE, "r_explosionclip", "1", "enables collision detection for explosion shell (so that it flattens against walls and floors)"};
+static cvar_t r_drawexplosions = {0, "r_drawexplosions", "1", "enables rendering of explosion shells (see also cl_particles_explosions_shell)"};
 
 static void r_explosion_start(void)
 {
@@ -141,7 +141,7 @@ void R_Explosion_Init(void)
        R_RegisterModule("R_Explosions", r_explosion_start, r_explosion_shutdown, r_explosion_newmap);
 }
 
-void R_NewExplosion(vec3_t org)
+void R_NewExplosion(const vec3_t org)
 {
        int i, j;
        float dist, n;
@@ -180,33 +180,30 @@ void R_NewExplosion(vec3_t org)
        }
 }
 
-static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, int surfacenumber, const rtlight_t *rtlight)
+static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist)
 {
-       const explosion_t *e = explosion + surfacenumber;
-       int numtriangles, numverts;
-       float alpha;
+       int surfacelistindex = 0;
+       const int numtriangles = EXPLOSIONTRIS, numverts = EXPLOSIONVERTS;
        rmeshstate_t m;
-
        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
        GL_DepthMask(false);
        GL_DepthTest(true);
-       R_Mesh_Matrix(&r_identitymatrix);
-
-       numtriangles = EXPLOSIONTRIS;
-       numverts = EXPLOSIONVERTS;
-       alpha = e->alpha;
+       R_Mesh_Matrix(&identitymatrix);
 
+       R_Mesh_ColorPointer(NULL);
        memset(&m, 0, sizeof(m));
        m.tex[0] = R_GetTexture(explosiontexture);
        m.pointer_texcoord[0] = explosiontexcoord2f[0];
-       m.pointer_vertex = e->vert[0];
-       R_Mesh_State(&m);
-
-       GL_Color(alpha, alpha, alpha, 1);
-
-       GL_LockArrays(0, numverts);
-       R_Mesh_Draw(0, numverts, numtriangles, explosiontris[0]);
-       GL_LockArrays(0, 0);
+       R_Mesh_TextureState(&m);
+       for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
+       {
+               const explosion_t *e = explosion + surfacelist[surfacelistindex];
+               R_Mesh_VertexPointer(e->vert[0]);
+               GL_Color(e->alpha, e->alpha, e->alpha, 1);
+               GL_LockArrays(0, numverts);
+               R_Mesh_Draw(0, numverts, numtriangles, explosiontris[0]);
+               GL_LockArrays(0, 0);
+       }
 }
 
 static void R_MoveExplosion(explosion_t *e)