OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- floatified the few remaining linedef and sector properties that still were fixed_t. The only fixed point things left in r_defs.h are the nodes and a fixed point setter function for vertex_t, which is still needed by the node builder.

Browse source
This commit is contained in:
Christoph Oelckers 2016-04-24 12:15:09 +02:00
commit 0f99d7d73f
21 changed files with 101 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/p_sectors.cpp
View file

@ -73,7 +73,7 @@ double sector_t::FindLowestFloorSurrounding (vertex_t **v) const
double ofloor;
vertex_t *spot;
if (linecount == 0) return GetPlaneTexZF(sector_t::floor);
if (linecount == 0) return GetPlaneTexZ(sector_t::floor);
spot = lines[0]->v1;
floor = floorplane.ZatPoint(spot);
@ -117,7 +117,7 @@ double sector_t::FindHighestFloorSurrounding (vertex_t **v) const
double ofloor;
vertex_t *spot;
if (linecount == 0) return GetPlaneTexZF(sector_t::floor);
if (linecount == 0) return GetPlaneTexZ(sector_t::floor);
spot = lines[0]->v1;
floor = -FLT_MAX;
@ -168,7 +168,7 @@ double sector_t::FindNextHighestFloor (vertex_t **v) const
line_t *check;
int i;
if (linecount == 0) return GetPlaneTexZF(sector_t::floor);
if (linecount == 0) return GetPlaneTexZ(sector_t::floor);
spot = lines[0]->v1;
height = floorplane.ZatPoint(spot);
@ -223,7 +223,7 @@ double sector_t::FindNextLowestFloor (vertex_t **v) const
line_t *check;
int i;
if (linecount == 0) return GetPlaneTexZF(sector_t::floor);
if (linecount == 0) return GetPlaneTexZ(sector_t::floor);
spot = lines[0]->v1;
height = floorplane.ZatPoint (spot);
@ -278,7 +278,7 @@ double sector_t::FindNextLowestCeiling (vertex_t **v) const
int i;
if (linecount == 0) return GetPlaneTexZF(sector_t::ceiling);
if (linecount == 0) return GetPlaneTexZ(sector_t::ceiling);
spot = lines[0]->v1;
height = ceilingplane.ZatPoint(spot);
@ -332,7 +332,7 @@ double sector_t::FindNextHighestCeiling (vertex_t **v) const
line_t *check;
int i;
if (linecount == 0) return GetPlaneTexZF(sector_t::ceiling);
if (linecount == 0) return GetPlaneTexZ(sector_t::ceiling);
spot = lines[0]->v1;
height = ceilingplane.ZatPoint(spot);
@ -378,7 +378,7 @@ double sector_t::FindLowestCeilingSurrounding (vertex_t **v) const
line_t *check;
int i;
if (linecount == 0) return GetPlaneTexZF(sector_t::ceiling);
if (linecount == 0) return GetPlaneTexZ(sector_t::ceiling);
spot = lines[0]->v1;
height = FLT_MAX;
@ -420,7 +420,7 @@ double sector_t::FindHighestCeilingSurrounding (vertex_t **v) const
line_t *check;
int i;
if (linecount == 0) return GetPlaneTexZF(sector_t::ceiling);
if (linecount == 0) return GetPlaneTexZ(sector_t::ceiling);
spot = lines[0]->v1;
height = -FLT_MAX;
@ -879,7 +879,7 @@ void sector_t::CheckPortalPlane(int plane)
if (GetPortalType(plane) == PORTS_LINKEDPORTAL)
{
double portalh = GetPortalPlaneZ(plane);
double planeh = GetPlaneTexZF(plane);
double planeh = GetPlaneTexZ(plane);
int obstructed = PLANEF_OBSTRUCTED * (plane == sector_t::floor ? planeh > portalh : planeh < portalh);
planes[plane].Flags = (planes[plane].Flags & ~PLANEF_OBSTRUCTED) | obstructed;
}