Merge branch 'fof-slopes-level-load-fix' into 'next'
FOF slopes level load fix See merge request STJr/SRB2!498
This commit is contained in:
commit
04215b732e
|
@ -600,6 +600,11 @@ void P_CopySectorSlope(line_t *line)
|
||||||
|
|
||||||
fsec->hasslope = true;
|
fsec->hasslope = true;
|
||||||
|
|
||||||
|
// if this is an FOF control sector, make sure any target sectors also are marked as having slopes
|
||||||
|
if (fsec->numattached)
|
||||||
|
for (i = 0; i < (int)fsec->numattached; i++)
|
||||||
|
sectors[fsec->attached[i]].hasslope = true;
|
||||||
|
|
||||||
line->special = 0; // Linedef was use to set slopes, it finished its job, so now make it a normal linedef
|
line->special = 0; // Linedef was use to set slopes, it finished its job, so now make it a normal linedef
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4973,6 +4973,10 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
|
||||||
// Add slopes
|
// Add slopes
|
||||||
ffloor->t_slope = &sec2->c_slope;
|
ffloor->t_slope = &sec2->c_slope;
|
||||||
ffloor->b_slope = &sec2->f_slope;
|
ffloor->b_slope = &sec2->f_slope;
|
||||||
|
// mark the target sector as having slopes, if the FOF has any of its own
|
||||||
|
// (this fixes FOF slopes glitching initially at level load in software mode)
|
||||||
|
if (sec2->hasslope)
|
||||||
|
sec->hasslope = true;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((flags & FF_SOLID) && (master->flags & ML_EFFECT1)) // Block player only
|
if ((flags & FF_SOLID) && (master->flags & ML_EFFECT1)) // Block player only
|
||||||
|
|
Loading…
Reference in New Issue