From 958d004119969ede21930ac2658de4151714f19e Mon Sep 17 00:00:00 2001 From: carnivoroussociety <38839485+carnivoroussociety@users.noreply.github.com> Date: Sat, 27 Nov 2021 21:18:53 +1100 Subject: [PATCH] [Blood] Match view height clamping behavior to 1.21 --- source/games/blood/src/view.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/games/blood/src/view.cpp b/source/games/blood/src/view.cpp index 1740b403b..8c8b2ac0c 100644 --- a/source/games/blood/src/view.cpp +++ b/source/games/blood/src/view.cpp @@ -642,13 +642,13 @@ void viewDrawScreen(bool sceneonly) int ceilingZ, floorZ; getzsofslope(nSectnum, cX, cY, &ceilingZ, &floorZ); - if (cZ >= floorZ) + if ((cZ > floorZ - (1 << 8)) && (getLowerLink(nSectnum) == nullptr)) // clamp to floor { - cZ = floorZ - (getUpperLink(nSectnum) ? 0 : (8 << 8)); + cZ = floorZ - (1 << 8); } - if (cZ <= ceilingZ) + if ((cZ < ceilingZ + (1 << 8)) && (getLowerLink(nSectnum) == nullptr)) // clamp to ceiling { - cZ = ceilingZ + (getLowerLink(nSectnum) ? 0 : (8 << 8)); + cZ = ceilingZ + (1 << 8); } cH = q16horiz(ClipRange(cH.asq16(), gi->playerHorizMin(), gi->playerHorizMax()));