zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-25 05:21:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix slope inconsistency for 64bit

Browse source 
- Fixed: Slope logic would change between 32bit and 64bit due to float
math.
This commit is contained in:
Edward Richardson 2014-11-16 16:23:15 +13:00
parent 92143f90fa
commit 9ccb839ae2
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_map.cpp
View file

@ -736,11 +736,9 @@ bool PIT_CheckLine(line_t *ld, const FBoundingBox &box, FCheckPosition &tm)
else else
{ // Find the point on the line closest to the actor's center, and use { // Find the point on the line closest to the actor's center, and use
// that to calculate openings // that to calculate openings
float dx = (float)ld->dx; SQWORD r_den = (SQWORD(ld->dx)*ld->dx + SQWORD(ld->dy)*ld->dy) / (1 << 24);
float dy = (float)ld->dy; SQWORD r_num = ((SQWORD(tm.x - ld->v1->x)*ld->dx) + (SQWORD(tm.y - ld->v1->y)*ld->dy));
fixed_t r = (fixed_t)(((float)(tm.x - ld->v1->x) * dx + fixed_t r = (fixed_t)(r_num / r_den);
(float)(tm.y - ld->v1->y) * dy) /
(dx*dx + dy*dy) * 16777216.f);
/* Printf ("%d:%d: %d (%d %d %d %d) (%d %d %d %d)\n", level.time, ld-lines, r, /* Printf ("%d:%d: %d (%d %d %d %d) (%d %d %d %d)\n", level.time, ld-lines, r,
ld->frontsector->floorplane.a, ld->frontsector->floorplane.a,
ld->frontsector->floorplane.b, ld->frontsector->floorplane.b,