From 71d675ce09d88583e6e077b7dd12cd9dc6a866c0 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Tue, 3 Oct 2017 14:10:57 -0600 Subject: [PATCH] light: factor out TEX_SPECIAL tests to Face_IsLightmapped --- light/bounce.cc | 2 +- light/ltface.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/light/bounce.cc b/light/bounce.cc index c05408b2..d1c08d69 100644 --- a/light/bounce.cc +++ b/light/bounce.cc @@ -105,7 +105,7 @@ Face_ShouldBounce(const mbsp_t *bsp, const bsp2_dface_t *face) return false; } - if (bsp->texinfo[face->texinfo].flags & TEX_SPECIAL) { + if (!Face_IsLightmapped(bsp, face)) { return false; } diff --git a/light/ltface.cc b/light/ltface.cc index b071c643..bb0d37fc 100644 --- a/light/ltface.cc +++ b/light/ltface.cc @@ -2672,7 +2672,7 @@ WriteLightmaps(bspdata_t *bspdata, bsp2_dface_t *face, facesup_t *facesup, const // sanity check that we don't save a lightmap for a non-lightmapped face { const char *texname = Face_TextureName(bsp, face); - Q_assert(!(bsp->texinfo[face->texinfo].flags & TEX_SPECIAL)); + Q_assert(Face_IsLightmapped(bsp, face)); Q_assert(Q_strcasecmp(texname, "skip") != 0); Q_assert(Q_strcasecmp(texname, "trigger") != 0); } @@ -2796,7 +2796,7 @@ LightFace(bspdata_t *bspdata, bsp2_dface_t *face, facesup_t *facesup, const glob for (int i = 0; i < MAXLIGHTMAPS; i++) face->styles[i] = 255; } - if (bsp->texinfo[face->texinfo].flags & TEX_SPECIAL) + if (!Face_IsLightmapped(bsp, face)) return; /* don't save lightmaps for "trigger" texture */