diff --git a/appveyor.yml b/appveyor.yml index fd949dbb3..85cee6a31 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -75,6 +75,9 @@ deploy: folder: appveyor application: active_mode: false + on: + branch: master + appveyor_repo_tag: true on_finish: diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index bec9cdb1b..c838e8325 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -1675,9 +1675,9 @@ static void HWR_StoreWallRange(double startfrac, double endfrac) else { // Skewed by bottom - wallVerts[0].t = (texturevpegtop + worldhigh - worldtop) * grTex->scaleY; - wallVerts[2].t = wallVerts[3].t - (worldhighslope - worldhigh) * grTex->scaleY; - wallVerts[1].t = wallVerts[2].t - (worldhighslope - worldtopslope) * grTex->scaleY; + wallVerts[0].t = wallVerts[1].t = (texturevpegtop + worldtop - worldhigh) * grTex->scaleY; + wallVerts[3].t = wallVerts[0].t - (worldtop - worldhigh) * grTex->scaleY; + wallVerts[2].t = wallVerts[1].t - (worldtopslope - worldhighslope) * grTex->scaleY; } #endif } @@ -1719,12 +1719,12 @@ static void HWR_StoreWallRange(double startfrac, double endfrac) if (!(gr_linedef->flags & ML_DONTPEGBOTTOM)) texturevpegbottom = 0; else if (gr_linedef->flags & ML_EFFECT1) - texturevpegbottom = worldtop - worldlow; + texturevpegbottom = worldbottom - worldlow; else - texturevpegbottom = gr_frontsector->ceilingheight - gr_backsector->floorheight; + texturevpegbottom = gr_frontsector->floorheight - gr_backsector->floorheight; #else if (gr_linedef->flags & ML_DONTPEGBOTTOM) - texturevpegbottom = worldtop - worldlow; + texturevpegbottom = worldbottom - worldlow; else texturevpegbottom = 0; #endif @@ -1752,9 +1752,9 @@ static void HWR_StoreWallRange(double startfrac, double endfrac) else if (gr_linedef->flags & ML_DONTPEGBOTTOM) { // Skewed by bottom - wallVerts[0].t = (texturevpegbottom + worldlow - worldbottom) * grTex->scaleY; - wallVerts[2].t = wallVerts[3].t - (worldlowslope - worldlow) * grTex->scaleY; - wallVerts[1].t = wallVerts[2].t - (worldbottomslope - worldlowslope) * grTex->scaleY; + wallVerts[0].t = wallVerts[1].t = (texturevpegbottom + worldlow - worldbottom) * grTex->scaleY; + //wallVerts[3].t = wallVerts[0].t - (worldlow - worldbottom) * grTex->scaleY; // no need, [3] is already this + wallVerts[2].t = wallVerts[1].t - (worldlowslope - worldbottomslope) * grTex->scaleY; } else {