OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- floatification of sector_t::centerspot.

Browse source
This commit is contained in:
Christoph Oelckers 2016-03-26 09:38:58 +01:00
commit 35bb686281
9 changed files with 52 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/p_3dfloors.cpp
View file

@ -464,13 +464,13 @@ void P_Recalculate3DFloors(sector_t * sector)
while (oldlist.Size())
{
pick=oldlist[0];
fixed_t height=pick->top.plane->ZatPoint(sector->centerspot);
fixed_t height=pick->top.plane->ZatPoint(sector->_f_centerspot());
// find highest starting ffloor - intersections are not supported!
pickindex=0;
for (j=1;j<oldlist.Size();j++)
{
fixed_t h2=oldlist[j]->top.plane->ZatPoint(sector->centerspot);
fixed_t h2=oldlist[j]->top.plane->ZatPoint(sector->_f_centerspot());
if (h2>height)
{
@ -481,7 +481,7 @@ void P_Recalculate3DFloors(sector_t * sector)
}
oldlist.Delete(pickindex);
fixed_t pick_bottom=pick->bottom.plane->ZatPoint(sector->centerspot);
fixed_t pick_bottom=pick->bottom.plane->ZatPoint(sector->_f_centerspot());
if (pick->flags & FF_THISINSIDE)
{
@ -595,7 +595,7 @@ void P_Recalculate3DFloors(sector_t * sector)
if ( !(rover->flags & FF_EXISTS) || rover->flags & FF_NOSHADE )
continue;
fixed_t ff_top=rover->top.plane->ZatPoint(sector->centerspot);
fixed_t ff_top=rover->top.plane->ZatPoint(sector->_f_centerspot());
if (ff_top < minheight) break; // reached the floor
if (ff_top < maxheight)
{
@ -610,7 +610,7 @@ void P_Recalculate3DFloors(sector_t * sector)
}
else
{
fixed_t ff_bottom=rover->bottom.plane->ZatPoint(sector->centerspot);
fixed_t ff_bottom=rover->bottom.plane->ZatPoint(sector->_f_centerspot());
if (ff_bottom<maxheight)
{
// this segment begins over the ceiling and extends beyond it
@ -636,7 +636,7 @@ void P_Recalculate3DFloors(sector_t * sector)
if (rover->flags&FF_DOUBLESHADOW)
{
fixed_t ff_bottom=rover->bottom.plane->ZatPoint(sector->centerspot);
fixed_t ff_bottom=rover->bottom.plane->ZatPoint(sector->_f_centerspot());
if(ff_bottom < maxheight && ff_bottom>minheight)
{
newlight.caster = rover;
@ -724,11 +724,11 @@ lightlist_t * P_GetPlaneLight(sector_t * sector, secplane_t * plane, bool unders
unsigned i;
TArray<lightlist_t> &lightlist = sector->e->XFloor.lightlist;
fixed_t planeheight=plane->ZatPoint(sector->centerspot);
fixed_t planeheight=plane->ZatPoint(sector->_f_centerspot());
if(underside) planeheight--;
for(i = 1; i < lightlist.Size(); i++)
if (lightlist[i].plane.ZatPoint(sector->centerspot) <= planeheight)
if (lightlist[i].plane.ZatPoint(sector->_f_centerspot()) <= planeheight)
return &lightlist[i - 1];
return &lightlist[lightlist.Size() - 1];
@ -989,8 +989,8 @@ CCMD (dump3df)
for (unsigned int i = 0; i < ffloors.Size(); i++)
{
fixed_t height=ffloors[i]->top.plane->ZatPoint(sector->centerspot);
fixed_t bheight=ffloors[i]->bottom.plane->ZatPoint(sector->centerspot);
fixed_t height=ffloors[i]->top.plane->ZatPoint(sector->_f_centerspot());
fixed_t bheight=ffloors[i]->bottom.plane->ZatPoint(sector->_f_centerspot());
IGNORE_FORMAT_PRE
Printf("FFloor %d @ top = %f (model = %d), bottom = %f (model = %d), flags = %B, alpha = %d %s %s\n",