zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 08:31:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Last commit was incomplete.

Browse source 
SVN r1175 (trunk)
This commit is contained in:
Christoph Oelckers 2008-08-16 20:47:41 +00:00
parent bc5d0c882b
commit 774e559eaf
6 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dsectoreffect.cpp
View file

@ -270,7 +270,7 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
MoveAttached(crush, -speed, 0, false); MoveAttached(crush, -speed, 0, false);
return crushed; return crushed;
} }
m_Sector->ChangePlaneTexZ(sector_t::floortexz, m_Sector->floorplane.HeightDiff (lastpos)); m_Sector->ChangePlaneTexZ(sector_t::floor, m_Sector->floorplane.HeightDiff (lastpos));
m_Sector->AdjustFloorClip (); m_Sector->AdjustFloorClip ();
} }
break; break;

2
src/p_floor.cpp
View file

@ -1157,7 +1157,7 @@ void DWaggleBase::DoWaggle (bool ceiling)
dist = plane->d; dist = plane->d;
plane->d = m_OriginalDist + plane->PointToDist (0, 0, plane->d = m_OriginalDist + plane->PointToDist (0, 0,
FixedMul (FloatBobOffsets[(m_Accumulator>>FRACBITS)&63], m_Scale)); FixedMul (FloatBobOffsets[(m_Accumulator>>FRACBITS)&63], m_Scale));
*texz += plane->HeightDiff (dist); m_Sector->ChangePlaneTexZ(pos, plane->HeightDiff (dist));
dist = plane->HeightDiff (dist); dist = plane->HeightDiff (dist);
P_ChangeSector (m_Sector, true, dist, ceiling, false); P_ChangeSector (m_Sector, true, dist, ceiling, false);
} }

2
src/p_linkedsectors.cpp
View file

@ -107,7 +107,7 @@ static bool MoveCeiling(sector_t *sector, int crush, fixed_t move)
static bool MoveFloor(sector_t *sector, int crush, fixed_t move) static bool MoveFloor(sector_t *sector, int crush, fixed_t move)
{ {
sector->floorplane.ChangeHeight (move); sector->floorplane.ChangeHeight (move);
sector->ChangePlaneTexZ(sector_t::floortexz, move); sector->ChangePlaneTexZ(sector_t::floor, move);
if (P_ChangeSector(sector, crush, move, 0, true)) return false; if (P_ChangeSector(sector, crush, move, 0, true)) return false;

12
src/p_sectors.cpp
View file

@ -107,7 +107,7 @@ fixed_t sector_t::FindHighestFloorSurrounding (vertex_t **v) const
fixed_t ofloor; fixed_t ofloor;
vertex_t *spot; vertex_t *spot;
if (linecount == 0) return floortexz; if (linecount == 0) return GetPlaneTexZ(sector_t::floor);
spot = lines[0]->v1; spot = lines[0]->v1;
floor = FIXED_MIN; floor = FIXED_MIN;
@ -158,7 +158,7 @@ fixed_t sector_t::FindNextHighestFloor (vertex_t **v) const
line_t *check; line_t *check;
int i; int i;
if (linecount == 0) return floortexz; if (linecount == 0) return GetPlaneTexZ(sector_t::floor);
spot = lines[0]->v1; spot = lines[0]->v1;
height = floorplane.ZatPoint (spot); height = floorplane.ZatPoint (spot);
@ -213,7 +213,7 @@ fixed_t sector_t::FindNextLowestFloor (vertex_t **v) const
line_t *check; line_t *check;
int i; int i;
if (linecount == 0) return floortexz; if (linecount == 0) return GetPlaneTexZ(sector_t::floor);
spot = lines[0]->v1; spot = lines[0]->v1;
height = floorplane.ZatPoint (spot); height = floorplane.ZatPoint (spot);
@ -324,7 +324,7 @@ fixed_t sector_t::FindNextHighestCeiling (vertex_t **v) const
line_t *check; line_t *check;
int i; int i;
if (linecount == 0) return ceilingtexz; if (linecount == 0) return GetPlaneTexZ(sector_t::ceiling);
spot = lines[0]->v1; spot = lines[0]->v1;
height = ceilingplane.ZatPoint (spot); height = ceilingplane.ZatPoint (spot);
@ -370,7 +370,7 @@ fixed_t sector_t::FindLowestCeilingSurrounding (vertex_t **v) const
line_t *check; line_t *check;
int i; int i;
if (linecount == 0) return ceilingtexz; if (linecount == 0) return GetPlaneTexZ(sector_t::ceiling);
spot = lines[0]->v1; spot = lines[0]->v1;
height = FIXED_MAX; height = FIXED_MAX;
@ -412,7 +412,7 @@ fixed_t sector_t::FindHighestCeilingSurrounding (vertex_t **v) const
line_t *check; line_t *check;
int i; int i;
if (linecount == 0) return ceilingtexz; if (linecount == 0) return GetPlaneTexZ(sector_t::ceiling);
spot = lines[0]->v1; spot = lines[0]->v1;
height = FIXED_MIN; height = FIXED_MIN;

4
src/p_slopes.cpp
View file

@ -498,8 +498,8 @@ static void P_AlignPlane (sector_t *sec, line_t *line, int which)
refplane = (which == 0) ? &refsec->floorplane : &refsec->ceilingplane; refplane = (which == 0) ? &refsec->floorplane : &refsec->ceilingplane;
srcplane = (which == 0) ? &sec->floorplane : &sec->ceilingplane; srcplane = (which == 0) ? &sec->floorplane : &sec->ceilingplane;
srcheight = (which == 0) ? sec->floortexz : sec->ceilingtexz; srcheight = (which == 0) ? sec->GetPlaneTexZ(sector_t::floor) : sec->GetPlaneTexZ(sector_t::ceiling);
destheight = (which == 0) ? refsec->floortexz : refsec->ceilingtexz; destheight = (which == 0) ? refsec->GetPlaneTexZ(sector_t::floor) : refsec->GetPlaneTexZ(sector_t::ceiling);
p[0] = FIXED2FLOAT (line->v1->x); p[0] = FIXED2FLOAT (line->v1->x);
p[1] = FIXED2FLOAT (line->v1->y); p[1] = FIXED2FLOAT (line->v1->y);

3
src/r_interpolate.cpp
View file

@ -454,7 +454,7 @@ void DSectorPlaneInterpolation::Restore()
else else
{ {
sector->ceilingplane.d = bakheight; sector->ceilingplane.d = bakheight;
sector->GetPlaneTexZ(sector_t::ceiling, baktexz?; sector->SetPlaneTexZ(sector_t::ceiling, baktexz);
} }
} }
@ -468,7 +468,6 @@ void DSectorPlaneInterpolation::Interpolate(fixed_t smoothratio)
{ {
fixed_t *pheight; fixed_t *pheight;
int pos; int pos;
fixed_t *ptexz;
if (!ceiling) if (!ceiling)
{ {