stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-26 04:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixup! fixup! fixup! Fix physics quirkiness on slopes with convex sectors

Browse source
This commit is contained in:
Gustaf Alhäll 2023-12-30 11:55:09 +01:00
parent faaf379c37
commit 2919133ea4
No known key found for this signature in database
GPG key ID: 6C1F67D690CDEDFD
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/r_main.c
View file

@ -1033,11 +1033,23 @@ boolean R_IsPointInSector(sector_t *sector, fixed_t x, fixed_t y)
v1 = sector->lines[i]->v1;
v2 = sector->lines[i]->v2;
// do some correction in order to prevent points outside the line from being measured.
if (R_PointToDist2(v.x, v.y, v1->x, v1->y) > R_PointToDist2(v1->x, v1->y, v2->x, v2->y))
v = *v2;
else if (R_PointToDist2(v.x, v.y, v2->x, v2->y) > R_PointToDist2(v1->x, v1->y, v2->x, v2->y))
v = *v1;
if (abs(v1->x - v2->x) > abs(v1->y - v2->y))
{
if (v.x < v1->x && v.x < v2->x)
v = v1->x < v2->x ? *v1 : *v2;
else if (v.x > v1->x && v.x > v2->x)
v = v1->x > v2->x ? *v1 : *v2;
}
else
{
if (v.y < v1->y && v.y < v2->y)
v = v1->y < v2->y ? *v1 : *v2;
else if (v.y > v1->y && v.y > v2->y)
v = v1->y > v2->y ? *v1 : *v2;
}
dist = R_PointToDist2(v.x, v.y, x, y);
if (dist < closestdist)
{