mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-05-10 10:51:42 +00:00
Merge branch 'fof-horizon-lines' into 'master'
Make FOFs extend to infinity when in contact with a horizon line. See merge request STJr/SRB2Internal!212
This commit is contained in:
commit
971565940f
1 changed files with 16 additions and 5 deletions
11
src/r_segs.c
11
src/r_segs.c
|
|
@ -2818,6 +2818,16 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
||||||
ffloor[i].f_pos >>= 4;
|
ffloor[i].f_pos >>= 4;
|
||||||
#ifdef ESLOPE
|
#ifdef ESLOPE
|
||||||
ffloor[i].f_pos_slope >>= 4;
|
ffloor[i].f_pos_slope >>= 4;
|
||||||
|
#endif
|
||||||
|
if (linedef->special == 41) // Horizon lines extend FOFs in contact with them too.
|
||||||
|
{
|
||||||
|
ffloor[i].f_step = 0;
|
||||||
|
ffloor[i].f_frac = (centeryfrac>>4);
|
||||||
|
topfrac++; // Prevent 1px HOM
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
#ifdef ESLOPE
|
||||||
ffloor[i].f_frac = (centeryfrac>>4) - FixedMul(ffloor[i].f_pos, rw_scale);
|
ffloor[i].f_frac = (centeryfrac>>4) - FixedMul(ffloor[i].f_pos, rw_scale);
|
||||||
ffloor[i].f_step = ((centeryfrac>>4) - FixedMul(ffloor[i].f_pos_slope, ds_p->scale2) - ffloor[i].f_frac)/(range);
|
ffloor[i].f_step = ((centeryfrac>>4) - FixedMul(ffloor[i].f_pos_slope, ds_p->scale2) - ffloor[i].f_frac)/(range);
|
||||||
#else
|
#else
|
||||||
|
|
@ -2826,6 +2836,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (backsector)
|
if (backsector)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue