Merge pull request 'Fix ground followers phasing through FOFs' (#157) from Wumbo/blankart:followerstuff into blankart-dev
Reviewed-on: https://codeberg.org/NepDisk/blankart/pulls/157
This commit is contained in:
commit
ef95e49e12
1 changed files with 2 additions and 4 deletions
|
|
@ -410,10 +410,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)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue