Add GL_ExtensionSupported in vid_null.c because vid_shared.c relies on
[xonotic/darkplaces.git] / r_explosion.c
index f46fe64..1145549 100644 (file)
@@ -19,66 +19,54 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+#include "cl_collision.h"
 
-#define MAX_EXPLOSIONS 64
+#ifdef MAX_EXPLOSIONS
 #define EXPLOSIONGRID 8
 #define EXPLOSIONVERTS ((EXPLOSIONGRID+1)*(EXPLOSIONGRID+1))
 #define EXPLOSIONTRIS (EXPLOSIONGRID*EXPLOSIONGRID*2)
-#define EXPLOSIONSTARTVELOCITY (384.0f)
-//#define EXPLOSIONRANDOMVELOCITY (32.0f)
-#define EXPLOSIONFADESTART (1.5f)
-#define EXPLOSIONFADERATE (4.5f)
-/*
-#define MAX_EXPLOSIONGAS (MAX_EXPLOSIONS * EXPLOSIONGAS)
-#define EXPLOSIONGAS 8
-#define EXPLOSIONGASSTARTRADIUS (15.0f)
-#define EXPLOSIONGASSTARTVELOCITY (50.0f)
-#define GASDENSITY_SCALER (32768.0f / EXPLOSIONGAS)
-#define GASFADERATE (GASDENSITY_SCALER * EXPLOSIONGAS * 2)
-
-typedef struct explosiongas_s
-{
-       float pressure;
-       vec3_t origin;
-       vec3_t velocity;
-}
-explosiongas_t;
 
-explosiongas_t explosiongas[MAX_EXPLOSIONGAS];
-*/
+static int numexplosions = 0;
 
-float explosiontexcoords[EXPLOSIONVERTS][2];
-int explosiontris[EXPLOSIONTRIS][3];
-int explosionnoiseindex[EXPLOSIONVERTS];
-vec3_t explosionpoint[EXPLOSIONVERTS];
-vec3_t explosionspherevertvel[EXPLOSIONVERTS];
+static float explosiontexcoord2f[EXPLOSIONVERTS][2];
+static unsigned short explosiontris[EXPLOSIONTRIS][3];
+static int explosionnoiseindex[EXPLOSIONVERTS];
+static vec3_t explosionpoint[EXPLOSIONVERTS];
 
 typedef struct explosion_s
 {
        float starttime;
+       float endtime;
        float time;
        float alpha;
+       float fade;
        vec3_t origin;
        vec3_t vert[EXPLOSIONVERTS];
        vec3_t vertvel[EXPLOSIONVERTS];
+       qboolean clipping;
 }
 explosion_t;
 
-explosion_t explosion[MAX_EXPLOSIONS];
+static explosion_t explosion[MAX_EXPLOSIONS];
 
-rtexture_t     *explosiontexture;
-rtexture_t     *explosiontexturefog;
+static rtexture_t      *explosiontexture;
+//static rtexture_t    *explosiontexturefog;
 
-rtexturepool_t *explosiontexturepool;
+static rtexturepool_t  *explosiontexturepool;
+#endif
 
-cvar_t r_explosionclip = {CVAR_SAVE, "r_explosionclip", "1"};
-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)"};
+#ifdef MAX_EXPLOSIONS
+static cvar_t r_drawexplosions = {0, "r_drawexplosions", "1", "enables rendering of explosion shells (see also cl_particles_explosions_shell)"};
 
-void r_explosion_start(void)
+//extern qboolean r_loadfog;
+static void r_explosion_start(void)
 {
        int x, y;
-       qbyte noise1[128][128], noise2[128][128], noise3[128][128], data[128][128][4];
+       static unsigned char noise1[128][128], noise2[128][128], noise3[128][128], data[128][128][4];
        explosiontexturepool = R_AllocTexturePool();
+       explosiontexture = NULL;
+       //explosiontexturefog = NULL;
        fractalnoise(&noise1[0][0], 128, 32);
        fractalnoise(&noise2[0][0], 128, 4);
        fractalnoise(&noise3[0][0], 128, 4);
@@ -92,56 +80,57 @@ void r_explosion_start(void)
                        g = (j * 256) / 256;
                        b = (j * 128) / 256;
                        a = noise3[y][x] * 3 - 128;
-                       data[y][x][0] = bound(0, r, 255);
+                       data[y][x][2] = bound(0, r, 255);
                        data[y][x][1] = bound(0, g, 255);
-                       data[y][x][2] = bound(0, b, 255);
+                       data[y][x][0] = bound(0, b, 255);
                        data[y][x][3] = bound(0, a, 255);
                }
        }
-       explosiontexture = R_LoadTexture (explosiontexturepool, "explosiontexture", 128, 128, &data[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE);
-       for (y = 0;y < 128;y++)
-               for (x = 0;x < 128;x++)
-                       data[y][x][0] = data[y][x][1] = data[y][x][2] = 255;
-       explosiontexturefog = R_LoadTexture (explosiontexturepool, "explosiontexturefog", 128, 128, &data[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE);
+       explosiontexture = R_LoadTexture2D(explosiontexturepool, "explosiontexture", 128, 128, &data[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_FORCELINEAR, -1, NULL);
+//     if (r_loadfog)
+//     {
+//             for (y = 0;y < 128;y++)
+//                     for (x = 0;x < 128;x++)
+//                             data[y][x][0] = data[y][x][1] = data[y][x][2] = 255;
+//             explosiontexturefog = R_LoadTexture2D(explosiontexturepool, "explosiontexture_fog", 128, 128, &data[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_FORCELINEAR, NULL);
+//     }
        // note that explosions survive the restart
 }
 
-void r_explosion_shutdown(void)
+static void r_explosion_shutdown(void)
 {
        R_FreeTexturePool(&explosiontexturepool);
 }
 
-void r_explosion_newmap(void)
+static void r_explosion_newmap(void)
 {
+       numexplosions = 0;
        memset(explosion, 0, sizeof(explosion));
-//     memset(explosiongas, 0, sizeof(explosiongas));
 }
 
-int R_ExplosionVert(int column, int row)
+static int R_ExplosionVert(int column, int row)
 {
        int i;
-       float a, b, c;
-       i = row * (EXPLOSIONGRID + 1) + column;
-       a = row * M_PI * 2 / EXPLOSIONGRID;
-       b = column * M_PI * 2 / EXPLOSIONGRID;
-       c = cos(b);
-       explosionpoint[i][0] = cos(a) * c;
-       explosionpoint[i][1] = sin(a) * c;
-       explosionpoint[i][2] = -sin(b);
-       explosionspherevertvel[i][0] = explosionpoint[i][0] * EXPLOSIONSTARTVELOCITY;
-       explosionspherevertvel[i][1] = explosionpoint[i][1] * EXPLOSIONSTARTVELOCITY;
-       explosionspherevertvel[i][2] = explosionpoint[i][2] * EXPLOSIONSTARTVELOCITY;
-       explosiontexcoords[i][0] = (float) column / (float) EXPLOSIONGRID;
-       explosiontexcoords[i][1] = (float) row / (float) EXPLOSIONGRID;
+       float yaw, pitch;
        // top and bottom rows are all one position...
        if (row == 0 || row == EXPLOSIONGRID)
                column = 0;
+       i = row * (EXPLOSIONGRID + 1) + column;
+       yaw = ((double) column / EXPLOSIONGRID) * M_PI * 2;
+       pitch = (((double) row / EXPLOSIONGRID) - 0.5) * M_PI;
+       explosionpoint[i][0] = cos(yaw) *  cos(pitch);
+       explosionpoint[i][1] = sin(yaw) *  cos(pitch);
+       explosionpoint[i][2] =        1 * -sin(pitch);
+       explosiontexcoord2f[i][0] = (float) column / (float) EXPLOSIONGRID;
+       explosiontexcoord2f[i][1] = (float) row / (float) EXPLOSIONGRID;
        explosionnoiseindex[i] = (row % EXPLOSIONGRID) * EXPLOSIONGRID + (column % EXPLOSIONGRID);
        return i;
 }
+#endif
 
 void R_Explosion_Init(void)
 {
+#ifdef MAX_EXPLOSIONS
        int i, x, y;
        i = 0;
        for (y = 0;y < EXPLOSIONGRID;y++)
@@ -159,314 +148,138 @@ void R_Explosion_Init(void)
                }
        }
 
+#endif
        Cvar_RegisterVariable(&r_explosionclip);
+#ifdef MAX_EXPLOSIONS
        Cvar_RegisterVariable(&r_drawexplosions);
 
-       R_RegisterModule("R_Explosions", r_explosion_start, r_explosion_shutdown, r_explosion_newmap);
+       R_RegisterModule("R_Explosions", r_explosion_start, r_explosion_shutdown, r_explosion_newmap, NULL, NULL);
+#endif
 }
 
-void R_NewExplosion(vec3_t org)
+void R_NewExplosion(const vec3_t org)
 {
+#ifdef MAX_EXPLOSIONS
        int i, j;
-       float dist;
-       qbyte noise[EXPLOSIONGRID*EXPLOSIONGRID];
-       fractalnoisequick(noise, EXPLOSIONGRID, 4);
-       for (i = 0;i < MAX_EXPLOSIONS;i++)
+       float dist, n;
+       explosion_t *e;
+       trace_t trace;
+       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++)
        {
-               if (explosion[i].alpha <= 0.01f)
+               if (!e->alpha)
                {
-                       explosion[i].starttime = cl.time;
-                       explosion[i].time = explosion[i].starttime - 0.1;
-                       explosion[i].alpha = EXPLOSIONFADESTART;
-                       VectorCopy(org, explosion[i].origin);
+                       numexplosions = max(numexplosions, i + 1);
+                       e->starttime = cl.time;
+                       e->endtime = cl.time + cl_explosions_lifetime.value;
+                       e->time = e->starttime;
+                       e->alpha = cl_explosions_alpha_start.value;
+                       e->fade = (cl_explosions_alpha_start.value - cl_explosions_alpha_end.value) / cl_explosions_lifetime.value;
+                       e->clipping = r_explosionclip.integer != 0;
+                       VectorCopy(org, e->origin);
                        for (j = 0;j < EXPLOSIONVERTS;j++)
                        {
-                               // calculate start
-                               VectorCopy(explosion[i].origin, explosion[i].vert[j]);
-                               // calculate velocity
-                               dist = noise[explosionnoiseindex[j]] * (1.0f / 255.0f) + 0.5;
-                               VectorScale(explosionspherevertvel[j], dist, explosion[i].vertvel[j]);
-                               //explosion[i].vertvel[j][0] = explosionspherevertvel[j][0] * dist; + (((float) noise[0][explosionnoiseindex[j]] - 128.0f) * (EXPLOSIONRANDOMVELOCITY / 128.0f));
-                               //explosion[i].vertvel[j][1] = explosionspherevertvel[j][1] * dist; + (((float) noise[1][explosionnoiseindex[j]] - 128.0f) * (EXPLOSIONRANDOMVELOCITY / 128.0f));
-                               //explosion[i].vertvel[j][2] = explosionspherevertvel[j][2] * dist; + (((float) noise[2][explosionnoiseindex[j]] - 128.0f) * (EXPLOSIONRANDOMVELOCITY / 128.0f));
+                               // calculate start origin and velocity
+                               n = noise[explosionnoiseindex[j]] * (1.0f / 255.0f) + 0.5;
+                               dist = n * cl_explosions_size_start.value;
+                               VectorMA(e->origin, dist, explosionpoint[j], e->vert[j]);
+                               dist = n * (cl_explosions_size_end.value - cl_explosions_size_start.value) / cl_explosions_lifetime.value;
+                               VectorScale(explosionpoint[j], dist, e->vertvel[j]);
+                               // clip start origin
+                               if (e->clipping)
+                               {
+                                       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]);
+                               }
                        }
                        break;
                }
        }
-
-       /*
-       i = 0;
-       j = EXPLOSIONGAS;
-       while (i < MAX_EXPLOSIONGAS && j > 0)
-       {
-               while (explosiongas[i].pressure > 0)
-               {
-                       i++;
-                       if (i >= MAX_EXPLOSIONGAS)
-                               return;
-               }
-               VectorRandom(v);
-               VectorMA(org, EXPLOSIONGASSTARTRADIUS, v, v);
-               TraceLine(org, v, explosiongas[i].origin, NULL, 0, true);
-               VectorRandom(v);
-               VectorScale(v, EXPLOSIONGASSTARTVELOCITY, explosiongas[i].velocity);
-               explosiongas[i].pressure = j * GASDENSITY_SCALER;
-               j--;
-       }
-       */
+#endif
 }
 
-void R_DrawExplosion(explosion_t *e)
+#ifdef MAX_EXPLOSIONS
+static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist)
 {
-       int i;
-       float c[EXPLOSIONVERTS][4], diff[3], /*fog, */ifog, alpha, dist, centerdist, size, scale;
-       rmeshinfo_t m;
-       memset(&m, 0, sizeof(m));
-       m.transparent = true;
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE; //_MINUS_SRC_ALPHA;
-       m.numtriangles = EXPLOSIONTRIS;
-       m.index = &explosiontris[0][0];
-       m.numverts = EXPLOSIONVERTS;
-       m.vertex = &e->vert[0][0];
-       m.vertexstep = sizeof(float[3]);
-       alpha = e->alpha;
-       if (alpha > 1)
-               alpha = 1;
-       m.cr = 1;
-       m.cg = 1;
-       m.cb = 1;
-       m.ca = alpha;
-       m.color = &c[0][0];
-       m.colorstep = sizeof(float[4]);
-       centerdist = DotProduct(e->origin, vpn);
-       size = 0;
-       for (i = 0;i < EXPLOSIONVERTS;i++)
-       {
-               dist = DotProduct(e->vert[i], vpn) - centerdist;
-               if (size > dist)
-                       size = dist;
-       }
-       scale = 1.0f / size;
-       if (fogenabled)
-       {
-               for (i = 0;i < EXPLOSIONVERTS;i++)
-               {
-                       dist = (DotProduct(e->vert[i], vpn) - centerdist) * scale;
-                       if (dist > 0)
-                       {
-                               // use inverse fog alpha as color
-                               VectorSubtract(e->vert[i], r_origin, diff);
-                               ifog = 1 - exp(fogdensity/DotProduct(diff,diff));
-                               if (ifog < 0)
-                                       ifog = 0;
-                               c[i][0] = c[i][1] = c[i][2] = dist * alpha * ifog;
-                       }
-                       else
-                               c[i][0] = c[i][1] = c[i][2] = 0;
-                       c[i][3] = 1;
-               }
-       }
-       else
+       int surfacelistindex = 0;
+       const int numtriangles = EXPLOSIONTRIS, numverts = EXPLOSIONVERTS;
+       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       GL_DepthMask(false);
+       GL_DepthRange(0, 1);
+       GL_PolygonOffset(r_refdef.polygonfactor, r_refdef.polygonoffset);
+       GL_DepthTest(true);
+       GL_CullFace(r_refdef.view.cullface_back);
+       R_EntityMatrix(&identitymatrix);
+
+//     R_Mesh_ResetTextureState();
+       R_SetupShader_Generic(explosiontexture, false, false, false);
+       for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
        {
-               for (i = 0;i < EXPLOSIONVERTS;i++)
-               {
-                       dist = (DotProduct(e->vert[i], vpn) - centerdist) * scale;
-                       if (dist > 0)
-                               c[i][0] = c[i][1] = c[i][2] = dist * alpha;
-                       else
-                               c[i][0] = c[i][1] = c[i][2] = 0;
-                       c[i][3] = 1;
-               }
-       }
-       /*
-       if (fogenabled)
-       {
-               m.color = &c[0][0];
-               m.colorstep = sizeof(float[4]);
-               for (i = 0;i < EXPLOSIONVERTS;i++)
-               {
-                       // use inverse fog alpha as color
-                       VectorSubtract(e->vert[i], r_origin, diff);
-                       ifog = 1 - exp(fogdensity/DotProduct(diff,diff));
-                       if (ifog < 0)
-                               ifog = 0;
-                       c[i][0] = ifog;
-                       c[i][1] = ifog;
-                       c[i][2] = ifog;
-                       c[i][3] = alpha;
-               }
+               const explosion_t *e = explosion + surfacelist[surfacelistindex];
+               // FIXME: this can't properly handle r_refdef.view.colorscale > 1
+               GL_Color(e->alpha * r_refdef.view.colorscale, e->alpha * r_refdef.view.colorscale, e->alpha * r_refdef.view.colorscale, 1);
+               R_Mesh_PrepareVertices_Generic_Arrays(numverts, e->vert[0], NULL, explosiontexcoord2f[0]);
+               R_Mesh_Draw(0, numverts, 0, numtriangles, NULL, NULL, 0, explosiontris[0], NULL, 0);
        }
-       */
-       m.tex[0] = R_GetTexture(explosiontexture);
-       m.texcoords[0] = &explosiontexcoords[0][0];
-       m.texcoordstep[0] = sizeof(float[2]);
-
-       R_Mesh_Draw(&m);
-
-       /*
-       if (fogenabled)
-       {
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE;
-               for (i = 0;i < EXPLOSIONVERTS;i++)
-               {
-                       VectorSubtract(e->vert[i], r_origin, diff);
-                       fog = exp(fogdensity/DotProduct(diff,diff));
-                       c[i][0] = fogcolor[0];
-                       c[i][1] = fogcolor[1];
-                       c[i][2] = fogcolor[2];
-                       c[i][3] = alpha * fog;
-               }
-               //m.color = &c[0][0];
-               //m.colorstep = sizeof(float[4]);
-               m.tex[0] = R_GetTexture(explosiontexturefog);
-               R_Mesh_Draw(&m);
-       }
-       */
 }
 
-void R_MoveExplosion(explosion_t *e/*, explosiongas_t **list, explosiongas_t **listend, */)
+static void R_MoveExplosion(explosion_t *e)
 {
        int i;
-       float dot, frictionscale, end[3], impact[3], normal[3], frametime;
-       /*
-       vec3_t diff;
-       vec_t dist;
-       explosiongas_t **l;
-       */
+       float dot, end[3], frametime;
+       trace_t trace;
+
        frametime = cl.time - e->time;
        e->time = cl.time;
-       e->alpha = EXPLOSIONFADESTART - (cl.time - e->starttime) * EXPLOSIONFADERATE;
-       if (e->alpha <= 0.01f)
+       e->alpha = e->alpha - (e->fade * frametime);
+       if (e->alpha < 0 || cl.time > e->endtime)
        {
-               e->alpha = -1;
+               e->alpha = 0;
                return;
        }
-       frictionscale = 1 - frametime;
-       frictionscale = bound(0, frictionscale, 1);
        for (i = 0;i < EXPLOSIONVERTS;i++)
        {
                if (e->vertvel[i][0] || e->vertvel[i][1] || e->vertvel[i][2])
                {
-                       //e->vertvel[i][2] += sv_gravity.value * frametime * -0.25f;
-                       VectorScale(e->vertvel[i], frictionscale, e->vertvel[i]);
                        VectorMA(e->vert[i], frametime, e->vertvel[i], end);
-                       if (r_explosionclip.integer)
+                       if (e->clipping)
                        {
-                               if (TraceLine(e->vert[i], end, impact, normal, 0, true) < 1)
+                               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
-                                       dot = DotProduct(e->vertvel[i], normal) * -1.125f;
-                                       VectorMA(e->vertvel[i], dot, normal, e->vertvel[i]);
+                                       dot = -DotProduct(e->vertvel[i], trace.plane.normal);
+                                       VectorMA(e->vertvel[i], dot, trace.plane.normal, e->vertvel[i]);
                                }
-                               VectorCopy(impact, e->vert[i]);
+                               VectorCopy(trace.endpos, e->vert[i]);
                        }
                        else
                                VectorCopy(end, e->vert[i]);
                }
-               /*
-               for (l = list;l < listend;l++)
-               {
-                       VectorSubtract(e->vert[i], (*l)->origin, diff);
-                       dist = DotProduct(diff, diff);
-                       if (dist < 4096 && dist >= 1)
-                       {
-                               dist = (*l)->pressure * frametime / dist;
-                               VectorMA(e->vertvel[i], dist, diff, e->vertvel[i]);
-                       }
-               }
-               */
        }
-       for (i = 0;i < EXPLOSIONGRID;i++)
-               VectorCopy(e->vert[i * (EXPLOSIONGRID + 1)], e->vert[i * (EXPLOSIONGRID + 1) + EXPLOSIONGRID]);
-       memcpy(e->vert[EXPLOSIONGRID * (EXPLOSIONGRID + 1)], e->vert[0], sizeof(float[3]) * (EXPLOSIONGRID + 1));
 }
+#endif
 
-/*
-void R_MoveExplosionGas(explosiongas_t *e, explosiongas_t **list, explosiongas_t **listend, float frametime)
-{
-       vec3_t end, diff;
-       vec_t dist, frictionscale;
-       explosiongas_t **l;
-       frictionscale = 1 - frametime;
-       frictionscale = bound(0, frictionscale, 1);
-       if (e->velocity[0] || e->velocity[1] || e->velocity[2])
-       {
-               end[0] = e->origin[0] + frametime * e->velocity[0];
-               end[1] = e->origin[1] + frametime * e->velocity[1];
-               end[2] = e->origin[2] + frametime * e->velocity[2];
-               if (r_explosionclip.integer)
-               {
-                       float f, dot;
-                       vec3_t impact, normal;
-                       f = TraceLine(e->origin, end, impact, normal, 0, true);
-                       VectorCopy(impact, e->origin);
-                       if (f < 1)
-                       {
-                               // clip velocity against the wall
-                               dot = DotProduct(e->velocity, normal) * -1.3f;
-                               e->velocity[0] += normal[0] * dot;
-                               e->velocity[1] += normal[1] * dot;
-                               e->velocity[2] += normal[2] * dot;
-                       }
-               }
-               else
-               {
-                       VectorCopy(end, e->origin);
-               }
-               e->velocity[2] += sv_gravity.value * frametime;
-               VectorScale(e->velocity, frictionscale, e->velocity);
-       }
-       for (l = list;l < listend;l++)
-       {
-               if (*l != e)
-               {
-                       VectorSubtract(e->origin, (*l)->origin, diff);
-                       dist = DotProduct(diff, diff);
-                       if (dist < 4096 && dist >= 1)
-                       {
-                               dist = (*l)->pressure * frametime / dist;
-                               VectorMA(e->velocity, dist, diff, e->velocity);
-                       }
-               }
-       }
-}
-*/
-
-void R_MoveExplosions(void)
+void R_DrawExplosions(void)
 {
+#ifdef MAX_EXPLOSIONS
        int i;
-       float frametime;
-//     explosiongas_t *gaslist[MAX_EXPLOSIONGAS], **l, **end;
-       frametime = cl.time - cl.oldtime;
-       /*
-       l = &gaslist[0];
-       for (i = 0;i < MAX_EXPLOSIONGAS;i++)
+
+       if (!r_drawexplosions.integer)
+               return;
+
+       for (i = 0;i < numexplosions;i++)
        {
-               if (explosiongas[i].pressure > 0)
+               if (explosion[i].alpha)
                {
-                       explosiongas[i].pressure -= frametime * GASFADERATE;
-                       if (explosiongas[i].pressure > 0)
-                               *l++ = &explosiongas[i];
+                       R_MoveExplosion(&explosion[i]);
+                       if (explosion[i].alpha)
+                               R_MeshQueue_AddTransparent(TRANSPARENTSORT_DISTANCE, explosion[i].origin, R_DrawExplosion_TransparentCallback, NULL, i, NULL);
                }
        }
-       end = l;
-       for (l = gaslist;l < end;l++)
-               R_MoveExplosionGas(*l, gaslist, end, frametime);
-       */
-
-       for (i = 0;i < MAX_EXPLOSIONS;i++)
-               if (explosion[i].alpha > 0.01f)
-                       R_MoveExplosion(&explosion[i]/*, gaslist, end, */);
+       while (numexplosions > 0 && explosion[i-1].alpha <= 0)
+               numexplosions--;
+#endif
 }
 
-void R_DrawExplosions(void)
-{
-       int i;
-       if (!r_drawexplosions.integer)
-               return;
-       for (i = 0;i < MAX_EXPLOSIONS;i++)
-               if (explosion[i].alpha > 0.01f)
-                       R_DrawExplosion(&explosion[i]);
-}