From bc1256757265f3954b30eec219b0ff8591975772 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 31 Jan 2013 22:39:23 +0900 Subject: [PATCH] Clean out a leftover from the 128 dlight change. I'd missed a set of bit->lightnum conversions that resulting in lightnum becoming much greater than 128 and thus trashing memory when the surface was marked. --- libs/video/renderer/gl/gl_rsurf.c | 2 +- libs/video/renderer/glsl/glsl_bsp.c | 2 +- libs/video/renderer/sw/sw_rmain.c | 2 +- libs/video/renderer/sw32/sw32_rmain.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/video/renderer/gl/gl_rsurf.c b/libs/video/renderer/gl/gl_rsurf.c index 032934dbd..3cfb3c49b 100644 --- a/libs/video/renderer/gl/gl_rsurf.c +++ b/libs/video/renderer/gl/gl_rsurf.c @@ -569,7 +569,7 @@ gl_R_DrawBrushModel (entity_t *e) continue; VectorSubtract (r_dlights[k].origin, e->origin, lightorigin); - R_RecursiveMarkLights (lightorigin, &r_dlights[k], 1 << k, + R_RecursiveMarkLights (lightorigin, &r_dlights[k], k, model->nodes + model->hulls[0].firstclipnode); } } diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c index 182000a06..13aad5a95 100644 --- a/libs/video/renderer/glsl/glsl_bsp.c +++ b/libs/video/renderer/glsl/glsl_bsp.c @@ -668,7 +668,7 @@ R_DrawBrushModel (entity_t *e) continue; VectorSubtract (r_dlights[k].origin, e->origin, lightorigin); - R_RecursiveMarkLights (lightorigin, &r_dlights[k], 1 << k, + R_RecursiveMarkLights (lightorigin, &r_dlights[k], k, model->nodes + model->hulls[0].firstclipnode); } } diff --git a/libs/video/renderer/sw/sw_rmain.c b/libs/video/renderer/sw/sw_rmain.c index 1b5e99a74..5d38ae04d 100644 --- a/libs/video/renderer/sw/sw_rmain.c +++ b/libs/video/renderer/sw/sw_rmain.c @@ -591,7 +591,7 @@ R_DrawBEntitiesOnList (void) currententity->origin, lightorigin); R_RecursiveMarkLights (lightorigin, &r_dlights[k], - 1 << k, clmodel->nodes + + k, clmodel->nodes + clmodel->hulls[0].firstclipnode); } } diff --git a/libs/video/renderer/sw32/sw32_rmain.c b/libs/video/renderer/sw32/sw32_rmain.c index 56c60ccfa..fd204e587 100644 --- a/libs/video/renderer/sw32/sw32_rmain.c +++ b/libs/video/renderer/sw32/sw32_rmain.c @@ -597,7 +597,7 @@ R_DrawBEntitiesOnList (void) currententity->origin, lightorigin); R_RecursiveMarkLights (lightorigin, &r_dlights[k], - 1 << k, clmodel->nodes + + k, clmodel->nodes + clmodel->hulls[0].firstclipnode); } }