Merge branch 'floorzatpos-slopefix' into 'next'

P_FloorzAtPos slope fix

See merge request !208
This commit is contained in:
Monster Iestyn 2017-09-04 15:00:49 -04:00
commit 1aa4972021

View file

@ -4000,6 +4000,11 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
sector_t *sec = R_PointInSubsector(x, y)->sector;
fixed_t floorz = sec->floorheight;
#ifdef ESLOPE
if (sec->f_slope)
floorz = P_GetZAt(sec->f_slope, x, y);
#endif
// Intercept the stupid 'fall through 3dfloors' bug Tails 03-17-2002
if (sec->ffloors)
{