fix GL11/GL13 fogged sprite rendering and q1bsp sky rendering - the

[xonotic/darkplaces.git] / r_explosion.c

diff --git a/r_explosion.c b/r_explosion.c
index a2282c9b70e1538fa2ee3516ebcde94774badacf..5e46117b3b950b93735ba4b0287c2ec553926907 100644 (file)
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -21,7 +21,7 @@ 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)
@@ -53,15 +53,20 @@ static rtexture_t   *explosiontexture;
 static rtexture_t      *explosiontexturefog;
 
 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)"};
+#ifdef MAX_EXPLOSIONS
 static cvar_t r_drawexplosions = {0, "r_drawexplosions", "1", "enables rendering of explosion shells (see also cl_particles_explosions_shell)"};
 
+extern qboolean r_loadfog;
 static void r_explosion_start(void)
 {
        int x, y;
        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);
@@ -82,10 +87,13 @@ static void r_explosion_start(void)
                }
        }
        explosiontexture = R_LoadTexture2D(explosiontexturepool, "explosiontexture", 128, 128, &data[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_FORCELINEAR, NULL);
-       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, "explosiontexturefog", 128, 128, &data[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_FORCELINEAR, 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_PRECACHE | TEXF_FORCELINEAR, NULL);
+       }
        // note that explosions survive the restart
 }
 
@@ -118,9 +126,11 @@ static int R_ExplosionVert(int column, int row)
        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++)
@@ -138,14 +148,18 @@ 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);
+#endif
 }
 
 void R_NewExplosion(const vec3_t org)
 {
+#ifdef MAX_EXPLOSIONS
        int i, j;
        float dist, n;
        explosion_t *e;
@@ -175,15 +189,17 @@ void R_NewExplosion(const vec3_t org)
                                // clip start origin
                                if (e->clipping)
                                {
-                                       trace = CL_Move(e->origin, vec3_origin, vec3_origin, e->vert[j], MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false);
+                                       trace = CL_TraceLine(e->origin, e->vert[j], MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false);
                                        VectorCopy(trace.endpos, e->vert[i]);
                                }
                        }
                        break;
                }
        }
+#endif
 }
 
+#ifdef MAX_EXPLOSIONS
 static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist)
 {
        int surfacelistindex = 0;
@@ -236,7 +252,7 @@ static void R_MoveExplosion(explosion_t *e)
                        VectorMA(e->vert[i], frametime, e->vertvel[i], end);
                        if (e->clipping)
                        {
-                               trace = CL_Move(e->vert[i], vec3_origin, vec3_origin, end, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false);
+                               trace = CL_TraceLine(e->vert[i], end, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false);
                                if (trace.fraction < 1)
                                {
                                        // clip velocity against the wall
@@ -250,9 +266,11 @@ static void R_MoveExplosion(explosion_t *e)
                }
        }
 }
+#endif
 
 void R_DrawExplosions(void)
 {
+#ifdef MAX_EXPLOSIONS
        int i;
 
        if (!r_drawexplosions.integer)
@@ -269,5 +287,6 @@ void R_DrawExplosions(void)
        }
        while (numexplosions > 0 && explosion[i-1].alpha <= 0)
                numexplosions--;
+#endif
 }