From 7db3bae349b94f3b11207adbcd94ce50f7bb8361 Mon Sep 17 00:00:00 2001 From: havoc Date: Fri, 15 Apr 2005 08:30:53 +0000 Subject: [PATCH] fix a bug in the early out case of R_Q1BSP_DrawLight git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5183 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_rsurf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gl_rsurf.c b/gl_rsurf.c index 9bfd27e0..fc920e1e 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -1787,6 +1787,14 @@ void R_Q1BSP_RecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, mnode_t *node) void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outclusterlist, qbyte *outclusterpvs, int *outnumclusterspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer) { r_q1bsp_getlightinfo_t info; + VectorCopy(relativelightorigin, info.relativelightorigin); + info.lightradius = lightradius; + info.lightmins[0] = info.relativelightorigin[0] - info.lightradius; + info.lightmins[1] = info.relativelightorigin[1] - info.lightradius; + info.lightmins[2] = info.relativelightorigin[2] - info.lightradius; + info.lightmaxs[0] = info.relativelightorigin[0] + info.lightradius; + info.lightmaxs[1] = info.relativelightorigin[1] + info.lightradius; + info.lightmaxs[2] = info.relativelightorigin[2] + info.lightradius; if (ent->model == NULL) { VectorCopy(info.lightmins, outmins); @@ -1796,20 +1804,12 @@ void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, floa return; } info.model = ent->model; - VectorCopy(relativelightorigin, info.relativelightorigin); - info.lightradius = lightradius; info.outclusterlist = outclusterlist; info.outclusterpvs = outclusterpvs; info.outnumclusters = 0; info.outsurfacelist = outsurfacelist; info.outsurfacepvs = outsurfacepvs; info.outnumsurfaces = 0; - info.lightmins[0] = info.relativelightorigin[0] - lightradius; - info.lightmins[1] = info.relativelightorigin[1] - lightradius; - info.lightmins[2] = info.relativelightorigin[2] - lightradius; - info.lightmaxs[0] = info.relativelightorigin[0] + lightradius; - info.lightmaxs[1] = info.relativelightorigin[1] + lightradius; - info.lightmaxs[2] = info.relativelightorigin[2] + lightradius; VectorCopy(info.relativelightorigin, info.outmins); VectorCopy(info.relativelightorigin, info.outmaxs); memset(outclusterpvs, 0, info.model->brush.num_pvsclusterbytes); -- 2.39.2