stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-31 21:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ffloorclip-fixes' into 'next'

Browse source 
ffloorclip fixes (resolves #385 and #391)

Closes #385 and #391

See merge request STJr/SRB2!1284
This commit is contained in:
James R 2020-12-10 15:35:39 -05:00
commit 8c74dd26a9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/r_segs.c
View file

@ -540,7 +540,7 @@ static boolean R_IsFFloorTranslucent(visffloor_t *pfloor)
// Polyobjects have no ffloors, and they're handled in the conditional above. // Polyobjects have no ffloors, and they're handled in the conditional above.
if (pfloor->ffloor != NULL) if (pfloor->ffloor != NULL)
return (pfloor->ffloor->flags & FF_TRANSLUCENT); return (pfloor->ffloor->flags & (FF_TRANSLUCENT|FF_FOG));
return false; return false;
} }
@ -1191,7 +1191,7 @@ static void R_RenderSegLoop (void)
// Lactozilla: Cull part of the column by the 3D floor if it can't be seen // Lactozilla: Cull part of the column by the 3D floor if it can't be seen
// "bottom" is the top pixel of the floor column // "bottom" is the top pixel of the floor column
if (ffbottom >= bottom-1 && R_FFloorCanClip(&ffloor[i])) if (ffbottom >= bottom-1 && R_FFloorCanClip(&ffloor[i]) && !curline->polyseg)
{ {
rw_floormarked = true; rw_floormarked = true;
floorclip[rw_x] = fftop; floorclip[rw_x] = fftop;
@ -1239,7 +1239,7 @@ static void R_RenderSegLoop (void)
// Lactozilla: Cull part of the column by the 3D floor if it can't be seen // Lactozilla: Cull part of the column by the 3D floor if it can't be seen
// "top" is the height of the ceiling column // "top" is the height of the ceiling column
if (fftop <= top+1 && R_FFloorCanClip(&ffloor[i])) if (fftop <= top+1 && R_FFloorCanClip(&ffloor[i]) && !curline->polyseg)
{ {
rw_ceilingmarked = true; rw_ceilingmarked = true;
ceilingclip[rw_x] = ffbottom; ceilingclip[rw_x] = ffbottom;