From 4b8d867847ff1770d44e77661a6587d62f3e7aa7 Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 8 Dec 2009 04:33:18 +0000 Subject: [PATCH] don't upload a fog texture for explosion shells if r_loadfog is false git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9563 d7cf8633-e32d-0410-b094-e92efae38249 --- r_explosion.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/r_explosion.c b/r_explosion.c index afb033da..5e46117b 100644 --- a/r_explosion.c +++ b/r_explosion.c @@ -59,11 +59,14 @@ cvar_t r_explosionclip = {CVAR_SAVE, "r_explosionclip", "1", "enables collision #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); @@ -84,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 } -- 2.39.2