Merge remote-tracking branch 'public/master'

This commit is contained in:
Alam Ed Arias 2016-05-25 06:42:01 -04:00
commit 8e32d978a1
3 changed files with 1 additions and 4 deletions

View File

@ -33,8 +33,6 @@ extern drawseg_t *drawsegs;
extern drawseg_t *ds_p;
extern INT32 doorclosed;
typedef void (*drawfunc_t)(INT32 start, INT32 stop);
// BSP?
void R_ClearClipSegs(void);
void R_PortalClearClipSegs(INT32 start, INT32 end);

View File

@ -73,7 +73,6 @@ extern visplane_t *ceilingplane;
// Visplane related.
extern INT16 *lastopening, *openings;
extern size_t maxopenings;
typedef void (*planefunction_t)(INT32 top, INT32 bottom);
extern INT16 floorclip[MAXVIDWIDTH], ceilingclip[MAXVIDWIDTH];
extern fixed_t frontscale[MAXVIDWIDTH], yslopetab[MAXVIDHEIGHT*4];

View File

@ -2480,7 +2480,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
ds_p->maskedtexturecol = ds_p->thicksidecol;
#ifdef ESLOPE
maskedtextureheight = &(ds_p->maskedtextureheight[0]); // ????
maskedtextureheight = ds_p->maskedtextureheight; // note to red, this == &(ds_p->maskedtextureheight[0])
// Set midtexture starting height
if (linedef->flags & ML_EFFECT2) { // Ignore slopes when texturing