zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed incomplete float conversion in R_RenderFakeWallRange.

Browse source
This commit is contained in:
Christoph Oelckers 2016-04-27 02:28:45 +02:00
parent fab38d092b
commit a26d81e060
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/r_segs.cpp
View file

@ -666,8 +666,8 @@ void R_RenderFakeWallRange (drawseg_t *ds, int x1, int x2)
int i,j; int i,j;
F3DFloor *rover, *fover = NULL; F3DFloor *rover, *fover = NULL;
int passed, last; int passed, last;
fixed_t floorheight; double floorHeight;
fixed_t ceilingheight; double ceilingHeight;
sprflipvert = false; sprflipvert = false;
curline = ds->curline; curline = ds->curline;
@ -686,16 +686,16 @@ void R_RenderFakeWallRange (drawseg_t *ds, int x1, int x2)
frontsector = sec; frontsector = sec;
} }
floorheight = FLOAT2FIXED(backsector->CenterFloor()); floorHeight = backsector->CenterFloor();
ceilingheight = FLOAT2FIXED(backsector->CenterCeiling()); ceilingHeight = backsector->CenterCeiling();
// maybe fix clipheights // maybe fix clipheights
if (!(fake3D & FAKE3D_CLIPBOTTOM)) sclipBottom = floorheight; if (!(fake3D & FAKE3D_CLIPBOTTOM)) sclipBottom = floorHeight;
if (!(fake3D & FAKE3D_CLIPTOP)) sclipTop = ceilingheight; if (!(fake3D & FAKE3D_CLIPTOP)) sclipTop = ceilingHeight;
// maybe not visible // maybe not visible
if (sclipBottom >= FLOAT2FIXED(frontsector->CenterCeiling())) return; if (sclipBottom >= frontsector->CenterCeiling()) return;
if (sclipTop <= FLOAT2FIXED(frontsector->CenterFloor())) return; if (sclipTop <= frontsector->CenterFloor()) return;
if (fake3D & FAKE3D_DOWN2UP) if (fake3D & FAKE3D_DOWN2UP)
{ // bottom to viewz { // bottom to viewz
@ -709,8 +709,8 @@ void R_RenderFakeWallRange (drawseg_t *ds, int x1, int x2)
passed = 0; passed = 0;
if (!(rover->flags & FF_RENDERSIDES) || rover->top.plane->isSlope() || rover->bottom.plane->isSlope() || if (!(rover->flags & FF_RENDERSIDES) || rover->top.plane->isSlope() || rover->bottom.plane->isSlope() ||
rover->top.plane->Zat0() <= sclipBottom || rover->top.plane->Zat0() <= sclipBottom ||
rover->bottom.plane->Zat0() >= ceilingheight || rover->bottom.plane->Zat0() >= ceilingHeight ||
rover->top.plane->Zat0() <= floorheight) rover->top.plane->Zat0() <= floorHeight)
{ {
if (!i) if (!i)
{ {
@ -892,8 +892,8 @@ void R_RenderFakeWallRange (drawseg_t *ds, int x1, int x2)
if (!(rover->flags & FF_RENDERSIDES) || if (!(rover->flags & FF_RENDERSIDES) ||
rover->top.plane->isSlope() || rover->bottom.plane->isSlope() || rover->top.plane->isSlope() || rover->bottom.plane->isSlope() ||
rover->bottom.plane->Zat0() >= sclipTop || rover->bottom.plane->Zat0() >= sclipTop ||
rover->top.plane->Zat0() <= floorheight || rover->top.plane->Zat0() <= floorHeight ||
rover->bottom.plane->Zat0() >= ceilingheight) rover->bottom.plane->Zat0() >= ceilingHeight)
{ {
if ((unsigned)i == backsector->e->XFloor.ffloors.Size() - 1) if ((unsigned)i == backsector->e->XFloor.ffloors.Size() - 1)
{ {