From 00c1831edb4f5e0c6662d996171defbdc031dc88 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Tue, 11 Jun 2013 15:47:00 -0500 Subject: [PATCH] Don't try to fog flares with fogNum 0 fogNum 0 means no fog. Shaders don't try to apply fog color if fogNum is 0. This was done to make things more consistent and fix a crash in iortcw MP using a user made map on GNU/Linux x86_64. --- code/renderergl1/tr_flares.c | 4 ++-- code/renderergl2/tr_flares.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/renderergl1/tr_flares.c b/code/renderergl1/tr_flares.c index ff768bab..1d0a9175 100644 --- a/code/renderergl1/tr_flares.c +++ b/code/renderergl1/tr_flares.c @@ -352,8 +352,8 @@ void RB_RenderFlare( flare_t *f ) { VectorScale(f->color, f->drawIntensity * intensity, color); -// Calculations for fogging - if(tr.world && f->fogNum < tr.world->numfogs) + // Calculations for fogging + if(tr.world && f->fogNum > 0 && f->fogNum < tr.world->numfogs) { tess.numVertexes = 1; VectorCopy(f->origin, tess.xyz[0]); diff --git a/code/renderergl2/tr_flares.c b/code/renderergl2/tr_flares.c index 8e6c321f..5bcefa2a 100644 --- a/code/renderergl2/tr_flares.c +++ b/code/renderergl2/tr_flares.c @@ -352,8 +352,8 @@ void RB_RenderFlare( flare_t *f ) { VectorScale(f->color, f->drawIntensity * intensity, color); -// Calculations for fogging - if(tr.world && f->fogNum < tr.world->numfogs) + // Calculations for fogging + if(tr.world && f->fogNum > 0 && f->fogNum < tr.world->numfogs) { tess.numVertexes = 1; VectorCopy(f->origin, tess.xyz[0]);