lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If NOT skewing FOF walls, make sure dc_texturemid reverts to using unsloped FOF topheight/bottomheight rather than actual left side top/bottom heights

This commit is contained in:
Monster Iestyn 2016-08-29 23:21:57 +01:00
parent a7dc20e7d2
commit 3bc7073918
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/r_segs.c
View File

@ -983,45 +983,45 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
left_bottom = P_GetZAt(*pfloor->b_slope, ds->leftpos.x, ds->leftpos.y) - viewz;
else
left_bottom = *pfloor->bottomheight - viewz;
dc_texturemid = left_top;
skewslope = *pfloor->t_slope; // skew using top slope by default
#else
dc_texturemid = *pfloor->topheight - viewz;
if (newline && newline->flags & ML_DONTPEGTOP)
slopeskew = true;
else if (pfloor->master->flags & ML_DONTPEGTOP)
slopeskew = true;
if (slopeskew)
dc_texturemid = left_top;
else
#endif
dc_texturemid = *pfloor->topheight - viewz;
if (newline)
{
offsetvalue = sides[newline->sidenum[0]].rowoffset;
if (newline->flags & ML_DONTPEGBOTTOM)
#ifdef ESLOPE
{
dc_texturemid = left_bottom;
skewslope = *pfloor->b_slope; // skew using bottom slope
}
#else
offsetvalue -= *pfloor->topheight - *pfloor->bottomheight;
#endif
#ifdef ESLOPE
if (newline->flags & ML_DONTPEGTOP)
slopeskew = true;
skewslope = *pfloor->b_slope; // skew using bottom slope
if (slopeskew)
dc_texturemid = left_bottom;
else
#endif
offsetvalue -= *pfloor->topheight - *pfloor->bottomheight;
}
}
else
{
offsetvalue = sides[pfloor->master->sidenum[0]].rowoffset;
if (curline->linedef->flags & ML_DONTPEGBOTTOM)
#ifdef ESLOPE
{
dc_texturemid = left_bottom;
skewslope = *pfloor->b_slope; // skew using bottom slope
}
#else
offsetvalue -= *pfloor->topheight - *pfloor->bottomheight;
#endif
#ifdef ESLOPE
if (pfloor->master->flags & ML_DONTPEGTOP) // use control linedef's flags
slopeskew = true;
skewslope = *pfloor->b_slope; // skew using bottom slope
if (slopeskew)
dc_texturemid = left_bottom;
else
#endif
offsetvalue -= *pfloor->topheight - *pfloor->bottomheight;
}
}
#ifdef ESLOPE