zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed compile errors due to changes in ZDoom.

This commit is contained in:
Christoph Oelckers 2016-02-25 13:06:13 +01:00
parent 205bbac411
commit 387f3dd03a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gl/scene/gl_flats.cpp
View File

@ -660,7 +660,7 @@ void GLFlat::ProcessSector(sector_t * frontsector)
if (rover->flags&FF_FOG && gl_fixedcolormap) continue; if (rover->flags&FF_FOG && gl_fixedcolormap) continue;
if (!rover->top.copied && rover->flags&(FF_INVERTPLANES|FF_BOTHPLANES)) if (!rover->top.copied && rover->flags&(FF_INVERTPLANES|FF_BOTHPLANES))
{ {
fixed_t ff_top=rover->top.plane->ZatPoint(CenterSpot(sector)); fixed_t ff_top=rover->top.plane->ZatPoint(sector->centerspot);
if (ff_top<lastceilingheight) if (ff_top<lastceilingheight)
{ {
if (FIXED2FLOAT(viewz) <= rover->top.plane->ZatPoint(FIXED2FLOAT(viewx), FIXED2FLOAT(viewy))) if (FIXED2FLOAT(viewz) <= rover->top.plane->ZatPoint(FIXED2FLOAT(viewx), FIXED2FLOAT(viewy)))
@ -674,7 +674,7 @@ void GLFlat::ProcessSector(sector_t * frontsector)
} }
if (!rover->bottom.copied && !(rover->flags&FF_INVERTPLANES)) if (!rover->bottom.copied && !(rover->flags&FF_INVERTPLANES))
{ {
fixed_t ff_bottom=rover->bottom.plane->ZatPoint(CenterSpot(sector)); fixed_t ff_bottom=rover->bottom.plane->ZatPoint(sector->centerspot);
if (ff_bottom<lastceilingheight) if (ff_bottom<lastceilingheight)
{ {
if (FIXED2FLOAT(viewz)<=rover->bottom.plane->ZatPoint(FIXED2FLOAT(viewx), FIXED2FLOAT(viewy))) if (FIXED2FLOAT(viewz)<=rover->bottom.plane->ZatPoint(FIXED2FLOAT(viewx), FIXED2FLOAT(viewy)))
@ -700,7 +700,7 @@ void GLFlat::ProcessSector(sector_t * frontsector)
if (rover->flags&FF_FOG && gl_fixedcolormap) continue; if (rover->flags&FF_FOG && gl_fixedcolormap) continue;
if (!rover->bottom.copied && rover->flags&(FF_INVERTPLANES|FF_BOTHPLANES)) if (!rover->bottom.copied && rover->flags&(FF_INVERTPLANES|FF_BOTHPLANES))
{ {
fixed_t ff_bottom=rover->bottom.plane->ZatPoint(CenterSpot(sector)); fixed_t ff_bottom=rover->bottom.plane->ZatPoint(sector->centerspot);
if (ff_bottom>lastfloorheight || (rover->flags&FF_FIX)) if (ff_bottom>lastfloorheight || (rover->flags&FF_FIX))
{ {
if (FIXED2FLOAT(viewz) >= rover->bottom.plane->ZatPoint(FIXED2FLOAT(viewx), FIXED2FLOAT(viewy))) if (FIXED2FLOAT(viewz) >= rover->bottom.plane->ZatPoint(FIXED2FLOAT(viewx), FIXED2FLOAT(viewy)))
@ -721,7 +721,7 @@ void GLFlat::ProcessSector(sector_t * frontsector)
} }
if (!rover->top.copied && !(rover->flags&FF_INVERTPLANES)) if (!rover->top.copied && !(rover->flags&FF_INVERTPLANES))
{ {
fixed_t ff_top=rover->top.plane->ZatPoint(CenterSpot(sector)); fixed_t ff_top=rover->top.plane->ZatPoint(sector->centerspot);
if (ff_top>lastfloorheight) if (ff_top>lastfloorheight)
{ {
if (FIXED2FLOAT(viewz) >= rover->top.plane->ZatPoint(FIXED2FLOAT(viewx), FIXED2FLOAT(viewy))) if (FIXED2FLOAT(viewz) >= rover->top.plane->ZatPoint(FIXED2FLOAT(viewx), FIXED2FLOAT(viewy)))