Merge branch 'woof-voxel_fix'

MrAlaux · Jan 17, 2025 · 651f389 · 651f389
2 parents 753ba57 + 1f4643b
commit 651f389
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@
 - **`comp_lsamnesia` inversely affecting collision with entities** (i.e. lost souls would remember their target)
 - **Weapon sprites being raised/lowered excessively when using switch interruption**
   with certain bobbing styles and/or reduced weapon bobbing amplitude
+- **Voxels rendering incorrectly near the top and bottom of the screen**
 - **_Flip Levels_ setting not working for side screens in three-screen mode**
 - **Message grouping only checking as many characters as the last message had**,
   causing incorrect grouping (e.g. new message "TEST" being grouped with last message "TES")

diff --git a/src/r_voxel.c b/src/r_voxel.c
@@ -874,13 +874,14 @@ static void VX_DrawColumn (vissprite_t * spr, int x, int y)
 			fixed_t uy0 = uy1;
 
 			// clip the slab vertically
-			if (uy1 >= clip_y2) break;
-			if (uy2 <= clip_y1) continue;
+			if (uy1 >= clip_y2) uy1 = clip_y2;
+			if (uy2 <= clip_y1) uy2 = clip_y1;
 
 			if (uy1 < clip_y1) uy1 = clip_y1;
 			if (uy2 > clip_y2) uy2 = clip_y2;
 
-			boolean has_side = ((face & (ux > Bx ? B_face : A_face)) != 0);
+			boolean has_side = ((face & (ux > Bx ? B_face : A_face)) != 0
+                          && uy1 < clip_y2 && uy2 > clip_y1);
 
 			// handle the fuzz effect for Spectres
 			if (shadow)