stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 13:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix occasionally running into an invisible wall around slopes

Browse source
This commit is contained in:
RedEnchilada 2015-04-30 18:36:21 -05:00
parent 3644d4d883
commit 79fedf91a0
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_mobj.c
View file

@ -754,10 +754,7 @@ fixed_t P_GetFloorZ(mobj_t *mobj, sector_t *sector, fixed_t x, fixed_t y, line_t
testy += y; testy += y;
// If the highest point is in the sector, then we have it easy! Just get the Z at that point // If the highest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == sector if (R_PointInSubsector(testx, testy)->sector == sector)
// The following line is a hack to fix a bug where an object pops down on the frame its highest corner re-enters the sloped sector.
|| R_PointInSubsector(testx+mobj->momx, testy+mobj->momy)->sector == sector
)
return P_GetZAt(slope, testx, testy); return P_GetZAt(slope, testx, testy);
// If we're just testing for base sector location (no collision line), just go for the center's spot... // If we're just testing for base sector location (no collision line), just go for the center's spot...
@ -889,10 +886,7 @@ fixed_t P_GetCeilingZ(mobj_t *mobj, sector_t *sector, fixed_t x, fixed_t y, line
testy += y; testy += y;
// If the lowest point is in the sector, then we have it easy! Just get the Z at that point // If the lowest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == sector if (R_PointInSubsector(testx, testy)->sector == sector)
// The following line is a hack to fix a bug where an object pops down on the frame its highest corner re-enters the sloped sector.
|| R_PointInSubsector(testx+mobj->momx, testy+mobj->momy)->sector == sector
)
return P_GetZAt(slope, testx, testy); return P_GetZAt(slope, testx, testy);
// If we're just testing for base sector location (no collision line), just go for the center's spot... // If we're just testing for base sector location (no collision line), just go for the center's spot...