Initial efforts towards reverting 2.1.15's changes to lower unpegged, in both renderers

This commit is contained in:
Monster Iestyn 2016-07-09 21:15:13 +01:00
parent 331ea9814f
commit 22b76c9fa3
2 changed files with 5 additions and 5 deletions

View file

@ -1719,12 +1719,12 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
if (!(gr_linedef->flags & ML_DONTPEGBOTTOM)) if (!(gr_linedef->flags & ML_DONTPEGBOTTOM))
texturevpegbottom = 0; texturevpegbottom = 0;
else if (gr_linedef->flags & ML_EFFECT1) else if (gr_linedef->flags & ML_EFFECT1)
texturevpegbottom = worldbottom - worldlow; texturevpegbottom = worldtop - worldlow;
else else
texturevpegbottom = gr_frontsector->floorheight - gr_backsector->floorheight; texturevpegbottom = gr_frontsector->ceilingheight - gr_backsector->floorheight;
#else #else
if (gr_linedef->flags & ML_DONTPEGBOTTOM) if (gr_linedef->flags & ML_DONTPEGBOTTOM)
texturevpegbottom = worldbottom - worldlow; texturevpegbottom = worldtop - worldlow;
else else
texturevpegbottom = 0; texturevpegbottom = 0;
#endif #endif

View file

@ -2214,7 +2214,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
#ifdef ESLOPE #ifdef ESLOPE
if (!(linedef->flags & ML_EFFECT1)) { // Ignore slopes for lower/upper textures unless flag is checked if (!(linedef->flags & ML_EFFECT1)) { // Ignore slopes for lower/upper textures unless flag is checked
if (linedef->flags & ML_DONTPEGBOTTOM) if (linedef->flags & ML_DONTPEGBOTTOM)
rw_bottomtexturemid = frontsector->floorheight - viewz; rw_bottomtexturemid = frontsector->ceilingheight - viewz; // use front ceilingheight, not floorheight
else else
rw_bottomtexturemid = backsector->floorheight - viewz; rw_bottomtexturemid = backsector->floorheight - viewz;
} else } else
@ -2223,7 +2223,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
{ {
// bottom of texture at bottom // bottom of texture at bottom
// top of texture at top // top of texture at top
rw_bottomtexturemid = worldbottom; rw_bottomtexturemid = worldtop; // use front ceilingheight, not floorheight
#ifdef ESLOPE #ifdef ESLOPE
rw_bottomtextureslide = floorfrontslide; rw_bottomtextureslide = floorfrontslide;
#endif #endif