vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'toast_slopes' of http://git.magicalgirl.moe/STJr/SRB2 into toast_slopes

Browse source
This commit is contained in:
toasterbabe 2016-06-02 14:40:36 +01:00
parent 1493537dfc 507b336bd6
commit 80fceafcb9
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -214,6 +214,7 @@ before_script:
- mkdir build - mkdir build
- cd build - cd build
- export CFLAGS="-Wall -W $WFLAGS" - export CFLAGS="-Wall -W $WFLAGS"
- export CCACHE_COMPRESS=true
- cmake .. -DCMAKE_BUILD_TYPE=Release - cmake .. -DCMAKE_BUILD_TYPE=Release
before_install: before_install:

3
appveyor.yml
View file

@ -75,6 +75,9 @@ deploy:
folder: appveyor folder: appveyor
application: application:
active_mode: false active_mode: false
on:
branch: master
appveyor_repo_tag: true
on_finish: on_finish:

18
src/hardware/hw_main.c
View file

@ -1675,9 +1675,9 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
else else
{ {
// Skewed by bottom // Skewed by bottom
wallVerts[0].t = (texturevpegtop + worldhigh - worldtop) * grTex->scaleY; wallVerts[0].t = wallVerts[1].t = (texturevpegtop + worldtop - worldhigh) * grTex->scaleY;
wallVerts[2].t = wallVerts[3].t - (worldhighslope - worldhigh) * grTex->scaleY; wallVerts[3].t = wallVerts[0].t - (worldtop - worldhigh) * grTex->scaleY;
wallVerts[1].t = wallVerts[2].t - (worldhighslope - worldtopslope) * grTex->scaleY; wallVerts[2].t = wallVerts[1].t - (worldtopslope - worldhighslope) * grTex->scaleY;
} }
#endif #endif
} }
@ -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 = worldtop - worldlow; texturevpegbottom = worldbottom - worldlow;
else else
texturevpegbottom = gr_frontsector->ceilingheight - gr_backsector->floorheight; texturevpegbottom = gr_frontsector->floorheight - gr_backsector->floorheight;
#else #else
if (gr_linedef->flags & ML_DONTPEGBOTTOM) if (gr_linedef->flags & ML_DONTPEGBOTTOM)
texturevpegbottom = worldtop - worldlow; texturevpegbottom = worldbottom - worldlow;
else else
texturevpegbottom = 0; texturevpegbottom = 0;
#endif #endif
@ -1752,9 +1752,9 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
else if (gr_linedef->flags & ML_DONTPEGBOTTOM) else if (gr_linedef->flags & ML_DONTPEGBOTTOM)
{ {
// Skewed by bottom // Skewed by bottom
wallVerts[0].t = (texturevpegbottom + worldlow - worldbottom) * grTex->scaleY; wallVerts[0].t = wallVerts[1].t = (texturevpegbottom + worldlow - worldbottom) * grTex->scaleY;
wallVerts[2].t = wallVerts[3].t - (worldlowslope - worldlow) * grTex->scaleY; //wallVerts[3].t = wallVerts[0].t - (worldlow - worldbottom) * grTex->scaleY; // no need, [3] is already this
wallVerts[1].t = wallVerts[2].t - (worldbottomslope - worldlowslope) * grTex->scaleY; wallVerts[2].t = wallVerts[1].t - (worldlowslope - worldbottomslope) * grTex->scaleY;
} }
else else
{ {