diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index a0701441c..89f951051 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -3820,7 +3820,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) continue; if (!lightset) - lightlevel = static_cast(CLAMP(*list[i-1].lightlevel, 0, 255)); + lightlevel = static_cast(*list[i-1].lightlevel); colormap = list[i-1].extra_colormap; break; @@ -3839,7 +3839,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) { if (!lightset) { - lightlevel = static_cast(CLAMP(*list[i].lightlevel, 0, 255)); + lightlevel = static_cast(*list[i].lightlevel); HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false); } @@ -4046,7 +4046,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) if (!lightset) { - lightlevel = static_cast(CLAMP(sector->lightlevel, 0, 255)); + lightlevel = static_cast(sector->lightlevel); HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false); } @@ -4147,7 +4147,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) // colormap test sector_t *sector = sprmo->subsector->sector; - UINT8 lightlevel = 255; + INT32 lightlevel = 255; extracolormap_t *colormap = sector->extra_colormap; if (sector->numlights) @@ -4157,7 +4157,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) light = R_GetPlaneLight(sector, sprmo->z + sprmo->height, false); // Always use the light at the top instead of whatever I was doing before if (!(sprmo->frame & FF_FULLBRIGHT)) - lightlevel = static_cast(CLAMP(*sector->lightlist[light].lightlevel, 0, 255)); + lightlevel = static_cast(*sector->lightlist[light].lightlevel); if (sector->lightlist[light].extra_colormap) colormap = sector->lightlist[light].extra_colormap; @@ -4165,7 +4165,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) else { if (!(sprmo->frame & FF_FULLBRIGHT)) - lightlevel = static_cast(CLAMP(sector->lightlevel, 0, 255)); + lightlevel = static_cast(sector->lightlevel); if (sector->extra_colormap) colormap = sector->extra_colormap; diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index e39c0e6b8..92a791e3b 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1150,7 +1150,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) light = R_GetPlaneLight(sector, spr->mobj->z + spr->mobj->height, false); // Always use the light at the top instead of whatever I was doing before if (!(spr->mobj->frame & FF_FULLBRIGHT)) - lightlevel = *sector->lightlist[light].lightlevel > 255 ? 255 : *sector->lightlist[light].lightlevel; + lightlevel = *sector->lightlist[light].lightlevel; if (sector->lightlist[light].extra_colormap) colormap = sector->lightlist[light].extra_colormap; @@ -1158,7 +1158,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) else { if (!(spr->mobj->frame & FF_FULLBRIGHT)) - lightlevel = sector->lightlevel > 255 ? 255 : sector->lightlevel; + lightlevel = sector->lightlevel; if (sector->extra_colormap) colormap = sector->extra_colormap;