added EF_DOUBLESIDED (and internally RENDER_NOCULLFACE)

[xonotic/darkplaces.git] / r_explosion.c

diff --git a/r_explosion.c b/r_explosion.c
index 4ce210da3557619928b9baf579a7faa583b2c13e..000fc692a9863123e98465221724442a0e969028 100644 (file)
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -58,7 +58,7 @@ static cvar_t r_drawexplosions = {0, "r_drawexplosions", "1"};
 static void r_explosion_start(void)
 {
        int x, y;
-       qbyte noise1[128][128], noise2[128][128], noise3[128][128], data[128][128][4];
+       unsigned char noise1[128][128], noise2[128][128], noise3[128][128], data[128][128][4];
        explosiontexturepool = R_AllocTexturePool();
        fractalnoise(&noise1[0][0], 128, 32);
        fractalnoise(&noise2[0][0], 128, 4);
@@ -147,7 +147,7 @@ void R_NewExplosion(vec3_t org)
        float dist, n;
        explosion_t *e;
        trace_t trace;
-       qbyte noise[EXPLOSIONGRID*EXPLOSIONGRID];
+       unsigned char noise[EXPLOSIONGRID*EXPLOSIONGRID];
        fractalnoisequick(noise, EXPLOSIONGRID, 4); // adjust noise grid size according to explosion
        for (i = 0, e = explosion;i < MAX_EXPLOSIONS;i++, e++)
        {
@@ -180,13 +180,12 @@ void R_NewExplosion(vec3_t org)
        }
 }
 
-static void R_DrawExplosionCallback(const void *calldata1, int calldata2)
+static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, int surfacenumber, const rtlight_t *rtlight)
 {
+       const explosion_t *e = explosion + surfacenumber;
        int numtriangles, numverts;
        float alpha;
        rmeshstate_t m;
-       const explosion_t *e;
-       e = (explosion_t *)calldata1;
 
        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
        GL_DepthMask(false);
@@ -258,6 +257,6 @@ void R_DrawExplosions(void)
                return;
        for (i = 0;i < MAX_EXPLOSIONS;i++)
                if (r_refdef.time < explosion[i].endtime)
-                       R_MeshQueue_AddTransparent(explosion[i].origin, R_DrawExplosionCallback, &explosion[i], 0);
+                       R_MeshQueue_AddTransparent(explosion[i].origin, R_DrawExplosion_TransparentCallback, NULL, i, NULL);
 }