Merge branch 'ground-follower-fix' into 'master'

Fix ground followers phasing through FOFs

See merge request kart-krew-dev/ring-racers!56
This commit is contained in:
Eidolon 2025-10-06 14:13:15 -05:00
commit 4d4738487a

View file

@ -477,10 +477,8 @@ void K_HandleFollower(player_t *player)
if (fl->mode == FOLLOWERMODE_GROUND)
{
sector_t *sec = R_PointInSubsector(sx, sy)->sector;
fh = min(fh, P_GetFloorZ(player->follower, sec, sx, sy, NULL));
ch = max(ch, P_GetCeilingZ(player->follower, sec, sx, sy, NULL) - ourheight);
fh = min(fh, P_FloorzAtPos(sx, sy, player->follower->z, ourheight));
ch = max(ch, P_CeilingzAtPos(sx, sy, player->follower->z, ourheight) - ourheight);
if (P_IsObjectOnGround(player->mo) == false)
{