diff --git a/src/doomdef.h b/src/doomdef.h
index f9828a442cfcf286e431c870452a80277df19b89..a91142e9d1171459b4226f8287640cd3812b17fb 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -578,9 +578,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
/// Dumps the contents of a network save game upon consistency failure for debugging.
//#define DUMPCONSISTENCY
-/// Polyobject fake flat code
-#define POLYOBJECTS_PLANES
-
/// See name of player in your crosshair
#define SEENAMES
diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c
index 6f3dd9fbd5290ead1959d17a70d0429582e6d963..ebb74f653ad0b5157f86a497e3d12df2696f3f4f 100644
--- a/src/hardware/hw_bsp.c
+++ b/src/hardware/hw_bsp.c
@@ -887,12 +887,10 @@ static void AdjustSegs(void)
float distv1,distv2,tmp;
nearv1 = nearv2 = MYMAX;
-#ifdef POLYOBJECTS
// Don't touch polyobject segs. We'll compensate
// for this when we go about drawing them.
if (lseg->polyseg)
continue;
-#endif
if (p) {
for (j = 0; j < p->numpts; j++)
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 7fca7cd91d53ad369f968ffc531caec0bbf884f4..50c76fb5aafb19ee4046f0326788263c2d10257a 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -1602,7 +1602,6 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
// heights of the polygon, and h & l, are the final (clipped)
// poly coords.
-#ifdef POLYOBJECTS
// NOTE: With polyobjects, whenever you need to check the properties of the polyobject sector it belongs to,
// you must use the linedef's backsector to be correct
// From CB
@@ -1612,7 +1611,6 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
popenbottom = back->floorheight;
}
else
-#endif
{
popentop = min(worldtop, worldhigh);
popenbottom = max(worldbottom, worldlow);
@@ -1642,7 +1640,6 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
polybottom = polytop - textureheight[gr_midtexture]*repeats;
}
// CB
-#ifdef POLYOBJECTS
// NOTE: With polyobjects, whenever you need to check the properties of the polyobject sector it belongs to,
// you must use the linedef's backsector to be correct
if (gr_curline->polyseg)
@@ -1650,7 +1647,6 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
lowcut = polybottom;
highcut = polytop;
}
-#endif
else
{
// The cut-off values of a linedef can always be constant, since every line has an absoulute front and or back sector
@@ -1780,7 +1776,6 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
break;
}
-#ifdef POLYOBJECTS
if (gr_curline->polyseg && gr_curline->polyseg->translucency > 0)
{
if (gr_curline->polyseg->translucency >= NUMTRANSMAPS) // wall not drawn
@@ -1791,7 +1786,6 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
else
blendmode = HWR_TranstableToAlpha(gr_curline->polyseg->translucency, &Surf);
}
-#endif
if (gr_frontsector->numlights)
{
@@ -2587,10 +2581,8 @@ static void HWR_AddLine(seg_t * line)
static sector_t tempsec;
fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t
-#ifdef POLYOBJECTS
if (line->polyseg && !(line->polyseg->flags & POF_RENDERSIDES))
return;
-#endif
gr_curline = line;
@@ -2717,13 +2709,10 @@ static void HWR_AddLine(seg_t * line)
if (bothceilingssky && bothfloorssky) // everything's sky? let's save us a bit of time then
{
- if (
-#ifdef POLYOBJECTS
- !line->polyseg &&
-#endif
- !line->sidedef->midtexture
- && ((!gr_frontsector->ffloors && !gr_backsector->ffloors)
- || (gr_frontsector->tag == gr_backsector->tag)))
+ if (!line->polyseg &&
+ !line->sidedef->midtexture
+ && ((!gr_frontsector->ffloors && !gr_backsector->ffloors)
+ || (gr_frontsector->tag == gr_backsector->tag)))
return; // line is empty, don't even bother
// treat like wide open window instead
HWR_ProcessSeg(); // Doesn't need arguments because they're defined globally :D
@@ -2759,13 +2748,10 @@ static void HWR_AddLine(seg_t * line)
if (bothceilingssky && bothfloorssky) // everything's sky? let's save us a bit of time then
{
- if (
-#ifdef POLYOBJECTS
- !line->polyseg &&
-#endif
- !line->sidedef->midtexture
- && ((!gr_frontsector->ffloors && !gr_backsector->ffloors)
- || (gr_frontsector->tag == gr_backsector->tag)))
+ if (!line->polyseg &&
+ !line->sidedef->midtexture
+ && ((!gr_frontsector->ffloors && !gr_backsector->ffloors)
+ || (gr_frontsector->tag == gr_backsector->tag)))
return; // line is empty, don't even bother
goto clippass; // treat like wide open window instead
@@ -2957,8 +2943,6 @@ static boolean HWR_CheckBBox(fixed_t *bspcoord)
#endif
}
-#ifdef POLYOBJECTS
-
//
// HWR_AddPolyObjectSegs
//
@@ -3001,7 +2985,6 @@ static inline void HWR_AddPolyObjectSegs(void)
Z_Free(gr_fakeline);
}
-#ifdef POLYOBJECTS_PLANES
static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling, fixed_t fixedheight,
FBITFIELD blendmode, UINT8 lightlevel, levelflat_t *levelflat, sector_t *FOFsector,
UINT8 alpha, extracolormap_t *planecolormap)
@@ -3256,8 +3239,6 @@ static void HWR_AddPolyObjectPlanes(void)
}
}
}
-#endif
-#endif
// -----------------+
// HWR_Subsector : Determine floor/ceiling planes.
@@ -3585,7 +3566,6 @@ static void HWR_Subsector(size_t num)
#endif
#endif //doplanes
-#ifdef POLYOBJECTS
// Draw all the polyobjects in this subsector
if (sub->polyList)
{
@@ -3606,15 +3586,12 @@ static void HWR_Subsector(size_t num)
// Draw polyobject lines.
HWR_AddPolyObjectSegs();
-#ifdef POLYOBJECTS_PLANES
if (sub->validcount != validcount) // This validcount situation seems to let us know that the floors have already been drawn.
{
// Draw polyobject planes
HWR_AddPolyObjectPlanes();
}
-#endif
}
-#endif
// Hurder ici se passe les choses INT32�essantes!
// on vient de tracer le sol et le plafond
@@ -3637,14 +3614,8 @@ static void HWR_Subsector(size_t num)
while (count--)
{
- if (!line->glseg
-#ifdef POLYOBJECTS
- && !line->polyseg // ignore segs that belong to polyobjects
-#endif
- )
- {
+ if (!line->glseg && !line->polyseg) // ignore segs that belong to polyobjects
HWR_AddLine(line);
- }
line++;
}
}
diff --git a/src/lua_blockmaplib.c b/src/lua_blockmaplib.c
index bc8d20e8eb2ba9113d027f0316cbaa3e99685ead..5aae73284d985f34c16d11498aa35105fdba92ba 100644
--- a/src/lua_blockmaplib.c
+++ b/src/lua_blockmaplib.c
@@ -80,9 +80,7 @@ static UINT8 lib_searchBlockmap_Lines(lua_State *L, INT32 x, INT32 y, mobj_t *th
{
INT32 offset;
const INT32 *list; // Big blockmap
-#ifdef POLYOBJECTS
polymaplink_t *plink; // haleyjd 02/22/06
-#endif
line_t *ld;
if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
@@ -90,7 +88,6 @@ static UINT8 lib_searchBlockmap_Lines(lua_State *L, INT32 x, INT32 y, mobj_t *th
offset = y*bmapwidth + x;
-#ifdef POLYOBJECTS
// haleyjd 02/22/06: consider polyobject lines
plink = polyblocklinks[offset];
@@ -133,7 +130,6 @@ static UINT8 lib_searchBlockmap_Lines(lua_State *L, INT32 x, INT32 y, mobj_t *th
}
plink = (polymaplink_t *)(plink->link.next);
}
-#endif
offset = *(blockmap + offset); // offset = blockmap[y*bmapwidth+x];
diff --git a/src/p_map.c b/src/p_map.c
index 0c21e3e69bd191ad7bcd8d8c985a5189edba443d..0fade484795369c806f722708964391af661aef9 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -2157,7 +2157,6 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
BMBOUNDFIX(xl, xh, yl, yh);
-#ifdef POLYOBJECTS
// Check polyobjects and see if tmfloorz/tmceilingz need to be altered
{
validcount++;
@@ -2229,7 +2228,6 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
}
}
}
-#endif
// tmfloorthing is set when tmfloorz comes from a thing's top
tmfloorthing = NULL;
@@ -2387,7 +2385,6 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
BMBOUNDFIX(xl, xh, yl, yh);
-#ifdef POLYOBJECTS
// Check polyobjects and see if tmfloorz/tmceilingz need to be altered
{
validcount++;
@@ -2458,7 +2455,6 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
}
}
}
-#endif
// check lines
for (bx = xl; bx <= xh; bx++)
diff --git a/src/p_maputl.c b/src/p_maputl.c
index bfca72edaa512ceac4b13f36168f678eed7002e5..b0289db36c7b3598f41c696c5f76d025512482c8 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -451,7 +451,6 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
I_Assert(back != NULL);
openfloorrover = openceilingrover = NULL;
-#ifdef POLYOBJECTS
if (linedef->polyobj)
{
// set these defaults so that polyobjects don't interfere with collision above or below them
@@ -462,7 +461,6 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
opentopslope = openbottomslope = NULL;
}
else
-#endif
{ // Set open and high/low values here
fixed_t frontheight, backheight;
@@ -517,7 +515,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
texheight = textures[texnum]->height << FRACBITS;
// Set texbottom and textop to the Z coordinates of the texture's boundaries
-#if 0 // #ifdef POLYOBJECTS
+#if 0
// don't remove this code unless solid midtextures
// on non-solid polyobjects should NEVER happen in the future
if (linedef->polyobj && (linedef->polyobj->flags & POF_TESTHEIGHT)) {
@@ -560,7 +558,6 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
}
}
}
-#ifdef POLYOBJECTS
if (linedef->polyobj)
{
// Treat polyobj's backsector like a 3D Floor
@@ -597,94 +594,95 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
// otherwise don't do anything special, pretend there's nothing else there
}
else
-#endif
- // Check for fake floors in the sector.
- if (front->ffloors || back->ffloors)
{
- ffloor_t *rover;
- fixed_t delta1, delta2;
-
- // Check for frontsector's fake floors
- for (rover = front->ffloors; rover; rover = rover->next)
+ // Check for fake floors in the sector.
+ if (front->ffloors || back->ffloors)
{
- fixed_t topheight, bottomheight;
- if (!(rover->flags & FF_EXISTS))
- continue;
+ ffloor_t *rover;
+ fixed_t delta1, delta2;
- if (mobj->player && (P_CheckSolidLava(rover) || P_CanRunOnWater(mobj->player, rover)))
- ;
- else if (!((rover->flags & FF_BLOCKPLAYER && mobj->player)
- || (rover->flags & FF_BLOCKOTHERS && !mobj->player)))
- continue;
+ // Check for frontsector's fake floors
+ for (rover = front->ffloors; rover; rover = rover->next)
+ {
+ fixed_t topheight, bottomheight;
+ if (!(rover->flags & FF_EXISTS))
+ continue;
- topheight = P_GetFOFTopZ(mobj, front, rover, tmx, tmy, linedef);
- bottomheight = P_GetFOFBottomZ(mobj, front, rover, tmx, tmy, linedef);
+ if (mobj->player && (P_CheckSolidLava(rover) || P_CanRunOnWater(mobj->player, rover)))
+ ;
+ else if (!((rover->flags & FF_BLOCKPLAYER && mobj->player)
+ || (rover->flags & FF_BLOCKOTHERS && !mobj->player)))
+ continue;
- delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
- delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
+ topheight = P_GetFOFTopZ(mobj, front, rover, tmx, tmy, linedef);
+ bottomheight = P_GetFOFBottomZ(mobj, front, rover, tmx, tmy, linedef);
- if (delta1 >= delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_PLATFORM) // thing is below FOF
- {
- if (bottomheight < opentop) {
- opentop = bottomheight;
- opentopslope = *rover->b_slope;
- openceilingrover = rover;
+ delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
+ delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
+
+ if (delta1 >= delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_PLATFORM) // thing is below FOF
+ {
+ if (bottomheight < opentop) {
+ opentop = bottomheight;
+ opentopslope = *rover->b_slope;
+ openceilingrover = rover;
+ }
+ else if (bottomheight < highceiling)
+ highceiling = bottomheight;
}
- else if (bottomheight < highceiling)
- highceiling = bottomheight;
- }
- if (delta1 < delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_REVERSEPLATFORM) // thing is above FOF
- {
- if (topheight > openbottom) {
- openbottom = topheight;
- openbottomslope = *rover->t_slope;
- openfloorrover = rover;
+ if (delta1 < delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_REVERSEPLATFORM) // thing is above FOF
+ {
+ if (topheight > openbottom) {
+ openbottom = topheight;
+ openbottomslope = *rover->t_slope;
+ openfloorrover = rover;
+ }
+ else if (topheight > lowfloor)
+ lowfloor = topheight;
}
- else if (topheight > lowfloor)
- lowfloor = topheight;
}
- }
- // Check for backsectors fake floors
- for (rover = back->ffloors; rover; rover = rover->next)
- {
- fixed_t topheight, bottomheight;
- if (!(rover->flags & FF_EXISTS))
- continue;
+ // Check for backsectors fake floors
+ for (rover = back->ffloors; rover; rover = rover->next)
+ {
+ fixed_t topheight, bottomheight;
+ if (!(rover->flags & FF_EXISTS))
+ continue;
- if (mobj->player && (P_CheckSolidLava(rover) || P_CanRunOnWater(mobj->player, rover)))
- ;
- else if (!((rover->flags & FF_BLOCKPLAYER && mobj->player)
- || (rover->flags & FF_BLOCKOTHERS && !mobj->player)))
- continue;
+ if (mobj->player && (P_CheckSolidLava(rover) || P_CanRunOnWater(mobj->player, rover)))
+ ;
+ else if (!((rover->flags & FF_BLOCKPLAYER && mobj->player)
+ || (rover->flags & FF_BLOCKOTHERS && !mobj->player)))
+ continue;
- topheight = P_GetFOFTopZ(mobj, back, rover, tmx, tmy, linedef);
- bottomheight = P_GetFOFBottomZ(mobj, back, rover, tmx, tmy, linedef);
+ topheight = P_GetFOFTopZ(mobj, back, rover, tmx, tmy, linedef);
+ bottomheight = P_GetFOFBottomZ(mobj, back, rover, tmx, tmy, linedef);
- delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
- delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
+ delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
+ delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
- if (delta1 >= delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_PLATFORM) // thing is below FOF
- {
- if (bottomheight < opentop) {
- opentop = bottomheight;
- opentopslope = *rover->b_slope;
- openceilingrover = rover;
+ if (delta1 >= delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_PLATFORM) // thing is below FOF
+ {
+ if (bottomheight < opentop) {
+ opentop = bottomheight;
+ opentopslope = *rover->b_slope;
+ openceilingrover = rover;
+ }
+ else if (bottomheight < highceiling)
+ highceiling = bottomheight;
}
- else if (bottomheight < highceiling)
- highceiling = bottomheight;
- }
- if (delta1 < delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_REVERSEPLATFORM) // thing is above FOF
- {
- if (topheight > openbottom) {
- openbottom = topheight;
- openbottomslope = *rover->t_slope;
- openfloorrover = rover;
+ if (delta1 < delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_REVERSEPLATFORM) // thing is above FOF
+ {
+ if (topheight > openbottom) {
+ openbottom = topheight;
+ openbottomslope = *rover->t_slope;
+ openfloorrover = rover;
+ }
+ else if (topheight > lowfloor)
+ lowfloor = topheight;
}
- else if (topheight > lowfloor)
- lowfloor = topheight;
}
}
}
@@ -934,9 +932,7 @@ boolean P_BlockLinesIterator(INT32 x, INT32 y, boolean (*func)(line_t *))
{
INT32 offset;
const INT32 *list; // Big blockmap
-#ifdef POLYOBJECTS
polymaplink_t *plink; // haleyjd 02/22/06
-#endif
line_t *ld;
if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
@@ -944,7 +940,6 @@ boolean P_BlockLinesIterator(INT32 x, INT32 y, boolean (*func)(line_t *))
offset = y*bmapwidth + x;
-#ifdef POLYOBJECTS
// haleyjd 02/22/06: consider polyobject lines
plink = polyblocklinks[offset];
@@ -968,7 +963,6 @@ boolean P_BlockLinesIterator(INT32 x, INT32 y, boolean (*func)(line_t *))
}
plink = (polymaplink_t *)(plink->link.next);
}
-#endif
offset = *(blockmap + offset); // offset = blockmap[y*bmapwidth+x];
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 29fe1a57c21c24e5eebc5b9ea7e8626aedefb9df..c78ec4a53941bfff0cc2787bd5dd0bd75f9eb281 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -2895,7 +2895,6 @@ static void P_PlayerZMovement(mobj_t *mo)
mo->eflags |= MFE_JUSTHITFLOOR; // Spin Attack
{
-#ifdef POLYOBJECTS
// Check if we're on a polyobject
// that triggers a linedef executor.
msecnode_t *node;
@@ -2955,8 +2954,6 @@ static void P_PlayerZMovement(mobj_t *mo)
}
if (!stopmovecut)
-#endif
-
// Cut momentum in half when you hit the ground and
// aren't pressing any controls.
if (!(mo->player->cmd.forwardmove || mo->player->cmd.sidemove) && !mo->player->cmomx && !mo->player->cmomy && !(mo->player->pflags & PF_SPINNING))
diff --git a/src/p_polyobj.c b/src/p_polyobj.c
index 7e1ff1f4948737385f8cdfdbdc1e4a39cc8012fb..0431707ace69eaa9bd51d138c5bb691b8e3a2c9e 100644
--- a/src/p_polyobj.c
+++ b/src/p_polyobj.c
@@ -28,12 +28,6 @@
#include "r_state.h"
#include "r_defs.h"
-
-#define POLYOBJECTS
-
-
-#ifdef POLYOBJECTS
-
/*
Theory behind Polyobjects:
@@ -3152,6 +3146,4 @@ INT32 EV_DoPolyObjFade(polyfadedata_t *pfdata)
return 1;
}
-#endif // ifdef POLYOBJECTS
-
// EOF
diff --git a/src/p_polyobj.h b/src/p_polyobj.h
index d56701d2d9666021629d5bcc632680de3460413d..7dfc90ce9d0fa444661a51e4f3c74dc237d2f9d0 100644
--- a/src/p_polyobj.h
+++ b/src/p_polyobj.h
@@ -18,8 +18,6 @@
#include "p_mobj.h"
#include "r_defs.h"
-// haleyjd: temporary define
-#ifdef POLYOBJECTS
//
// Defines
//
@@ -353,8 +351,6 @@ extern polyobj_t *PolyObjects;
extern INT32 numPolyObjects;
extern polymaplink_t **polyblocklinks; // polyobject blockmap
-#endif // ifdef POLYOBJECTS
-
#endif
// EOF
diff --git a/src/p_saveg.c b/src/p_saveg.c
index e8c6593faeef1dd498f004d7324149266398bca4..34bd3724b7a4b6ceb7a908a669ce7de888c8ed1c 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -1300,7 +1300,6 @@ typedef enum
tc_planedisplace,
tc_dynslopeline,
tc_dynslopevert,
-#ifdef POLYOBJECTS
tc_polyrotate, // haleyjd 03/26/06: polyobjects
tc_polymove,
tc_polywaypoint,
@@ -1310,7 +1309,6 @@ typedef enum
tc_polydisplace,
tc_polyrotdisplace,
tc_polyfade,
-#endif
tc_end
} specials_e;
@@ -1991,7 +1989,6 @@ static inline void SaveDynamicSlopeThinker(const thinker_t *th, const UINT8 type
WRITEMEM(save_p, ht->vex, sizeof(ht->vex));
}
-#ifdef POLYOBJECTS
static inline void SavePolyrotatetThinker(const thinker_t *th, const UINT8 type)
{
const polyrotate_t *ht = (const void *)th;
@@ -2100,7 +2097,6 @@ static void SavePolyfadeThinker(const thinker_t *th, const UINT8 type)
WRITEINT32(save_p, ht->duration);
WRITEINT32(save_p, ht->timer);
}
-#endif
static void P_NetArchiveThinkers(void)
{
@@ -2272,7 +2268,6 @@ static void P_NetArchiveThinkers(void)
SavePlaneDisplaceThinker(th, tc_planedisplace);
continue;
}
-#ifdef POLYOBJECTS
else if (th->function.acp1 == (actionf_p1)T_PolyObjRotate)
{
SavePolyrotatetThinker(th, tc_polyrotate);
@@ -2318,7 +2313,6 @@ static void P_NetArchiveThinkers(void)
SavePolyfadeThinker(th, tc_polyfade);
continue;
}
-#endif
else if (th->function.acp1 == (actionf_p1)T_DynamicSlopeLine)
{
SaveDynamicSlopeThinker(th, tc_dynslopeline);
@@ -3138,7 +3132,6 @@ static inline thinker_t* LoadDynamicSlopeThinker(actionf_p1 thinker)
return &ht->thinker;
}
-#ifdef POLYOBJECTS
static inline thinker_t* LoadPolyrotatetThinker(actionf_p1 thinker)
{
polyrotate_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3255,7 +3248,6 @@ static thinker_t* LoadPolyfadeThinker(actionf_p1 thinker)
ht->timer = READINT32(save_p);
return &ht->thinker;
}
-#endif
static void P_NetUnArchiveThinkers(void)
{
@@ -3416,7 +3408,6 @@ static void P_NetUnArchiveThinkers(void)
case tc_planedisplace:
th = LoadPlaneDisplaceThinker((actionf_p1)T_PlaneDisplace);
break;
-#ifdef POLYOBJECTS
case tc_polyrotate:
th = LoadPolyrotatetThinker((actionf_p1)T_PolyObjRotate);
break;
@@ -3453,7 +3444,6 @@ static void P_NetUnArchiveThinkers(void)
case tc_polyfade:
th = LoadPolyfadeThinker((actionf_p1)T_PolyObjFade);
break;
-#endif
case tc_dynslopeline:
th = LoadDynamicSlopeThinker((actionf_p1)T_DynamicSlopeLine);
@@ -3515,7 +3505,6 @@ static void P_NetUnArchiveThinkers(void)
//
// haleyjd 03/26/06: PolyObject saving code
//
-#ifdef POLYOBJECTS
#define PD_FLAGS 0x01
#define PD_TRANS 0x02
@@ -3604,7 +3593,6 @@ static inline void P_UnArchivePolyObjects(void)
for (i = 0; i < numSavedPolys; ++i)
P_UnArchivePolyObj(&PolyObjects[i]);
}
-#endif
static inline void P_FinishMobjs(void)
{
@@ -4078,9 +4066,7 @@ void P_SaveNetGame(void)
if (gamestate == GS_LEVEL)
{
P_NetArchiveWorld();
-#ifdef POLYOBJECTS
P_ArchivePolyObjects();
-#endif
P_NetArchiveThinkers();
P_NetArchiveSpecials();
P_NetArchiveColormaps();
@@ -4118,9 +4104,7 @@ boolean P_LoadNetGame(void)
if (gamestate == GS_LEVEL)
{
P_NetUnArchiveWorld();
-#ifdef POLYOBJECTS
P_UnArchivePolyObjects();
-#endif
P_NetUnArchiveThinkers();
P_NetUnArchiveSpecials();
P_NetUnArchiveColormaps();
diff --git a/src/p_setup.c b/src/p_setup.c
index 8c73b85e6f7f36392d9ad3829e7a3bf1366f8407..b3b618e51827fcaecc2fefe4b4af669e0f0551fb 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -953,9 +953,7 @@ static void P_InitializeLinedef(line_t *ld)
ld->splats = NULL;
#endif
ld->firsttag = ld->nexttag = -1;
-#ifdef POLYOBJECTS
ld->polyobj = NULL;
-#endif
ld->text = NULL;
ld->callcount = 0;
@@ -1869,10 +1867,8 @@ static void P_InitializeSeg(seg_t *seg)
seg->numlights = 0;
seg->rlights = NULL;
-#ifdef POLYOBJECTS
seg->polyseg = NULL;
seg->dontrenderme = false;
-#endif
}
static void P_LoadSegs(UINT8 *data)
@@ -2235,11 +2231,9 @@ static boolean P_LoadBlockMap(UINT8 *data, size_t count)
blocklinks = Z_Calloc(count, PU_LEVEL, NULL);
blockmap = blockmaplump+4;
-#ifdef POLYOBJECTS
// haleyjd 2/22/06: setup polyobject blockmap
count = sizeof(*polyblocklinks) * bmapwidth * bmapheight;
polyblocklinks = Z_Calloc(count, PU_LEVEL, NULL);
-#endif
return true;
}
@@ -2490,11 +2484,9 @@ static void P_CreateBlockMap(void)
blocklinks = Z_Calloc(count, PU_LEVEL, NULL);
blockmap = blockmaplump + 4;
-#ifdef POLYOBJECTS
// haleyjd 2/22/06: setup polyobject blockmap
count = sizeof(*polyblocklinks) * bmapwidth * bmapheight;
polyblocklinks = Z_Calloc(count, PU_LEVEL, NULL);
-#endif
}
}
diff --git a/src/p_sight.c b/src/p_sight.c
index 3d1ee9e601090190739da591c68acbecd0dd06e7..3e44281d0511e65c8841033242cd6ca8c1dadafd 100644
--- a/src/p_sight.c
+++ b/src/p_sight.c
@@ -100,7 +100,6 @@ static fixed_t P_InterceptVector2(divline_t *v2, divline_t *v1)
return frac;
}
-#ifdef POLYOBJECTS
static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los)
{
size_t i;
@@ -169,7 +168,6 @@ static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los)
return true;
}
-#endif
//
// P_CrossSubsector
@@ -180,9 +178,7 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
{
seg_t *seg;
INT32 count;
-#ifdef POLYOBJECTS
polyobj_t *po; // haleyjd 02/23/06
-#endif
#ifdef RANGECHECK
if (num >= numsubsectors)
@@ -192,7 +188,6 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
// haleyjd 02/23/06: this assignment should be after the above check
seg = segs + subsectors[num].firstline;
-#ifdef POLYOBJECTS
// haleyjd 02/23/06: check polyobject lines
if ((po = subsectors[num].polyList))
{
@@ -207,7 +202,6 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
po = (polyobj_t *)(po->link.next);
}
}
-#endif
for (count = subsectors[num].numlines; --count >= 0; seg++) // check lines
{
@@ -413,15 +407,10 @@ boolean P_CheckSight(mobj_t *t1, mobj_t *t2)
// killough 11/98: shortcut for melee situations
// same subsector? obviously visible
-#ifndef POLYOBJECTS
- if (t1->subsector == t2->subsector)
- return true;
-#else
// haleyjd 02/23/06: can't do this if there are polyobjects in the subsec
if (!t1->subsector->polyList &&
t1->subsector == t2->subsector)
return true;
-#endif
// An unobstructed LOS is possible.
// Now look from eyes of t1 to any part of t2.
diff --git a/src/p_spec.c b/src/p_spec.c
index cebab09028974b19070314baf33ab778bef31c8d..c93846438d808394bf7dcc287794d88d2d7a8d2a 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -1076,9 +1076,6 @@ INT32 P_FindSpecialLineFromTag(INT16 special, INT16 tag, INT32 start)
}
}
-// haleyjd: temporary define
-#ifdef POLYOBJECTS
-
//
// PolyDoor
//
@@ -1401,8 +1398,6 @@ static boolean PolyRotDisplace(line_t *line)
return EV_DoPolyObjRotDisplace(&pdd);
}
-#endif // ifdef POLYOBJECTS
-
/** Changes a sector's tag.
* Used by the linedef executor tag changer and by crumblers.
*
@@ -4010,7 +4005,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
}
break;
-#ifdef POLYOBJECTS
case 480: // Polyobj_DoorSlide
case 481: // Polyobj_DoorSwing
PolyDoor(line);
@@ -4040,7 +4034,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
case 492:
PolyFade(line);
break;
-#endif
default:
break;
@@ -7281,7 +7274,6 @@ void P_SpawnSpecials(boolean fromnetsave)
Z_Free(secthinkers);
-#ifdef POLYOBJECTS
// haleyjd 02/20/06: spawn polyobjects
Polyobj_InitLevel();
@@ -7302,7 +7294,6 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
}
}
-#endif
P_RunLevelLoadExecutors();
}
diff --git a/src/p_user.c b/src/p_user.c
index b2f40fe7066944214b2e17790391185dd0d5b5a0..36a1054c633fe8578591a12c1b39059a930af0e8 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -3847,7 +3847,6 @@ static void P_DoTeeter(player_t *player)
BMBOUNDFIX(xl, xh, yl, yh);
// Polyobjects
-#ifdef POLYOBJECTS
validcount++;
for (by = yl; by <= yh; by++)
@@ -3941,7 +3940,6 @@ static void P_DoTeeter(player_t *player)
plink = (polymaplink_t *)(plink->link.next);
}
}
-#endif
if (teeter) // only bother with objects as a last resort if you were already teetering
{
mobj_t *oldtmthing = tmthing;
@@ -5702,11 +5700,7 @@ static void P_2dMovement(player_t *player)
}
else if (player->onconveyor == 4 && !P_IsObjectOnGround(player->mo)) // Actual conveyor belt
player->cmomx = player->cmomy = 0;
- else if (player->onconveyor != 2 && player->onconveyor != 4
-#ifdef POLYOBJECTS
- && player->onconveyor != 1
-#endif
- )
+ else if (player->onconveyor != 2 && player->onconveyor != 4 && player->onconveyor != 1)
player->cmomx = player->cmomy = 0;
player->rmomx = player->mo->momx - player->cmomx;
@@ -5901,11 +5895,7 @@ static void P_3dMovement(player_t *player)
}
else if (player->onconveyor == 4 && !P_IsObjectOnGround(player->mo)) // Actual conveyor belt
player->cmomx = player->cmomy = 0;
- else if (player->onconveyor != 2 && player->onconveyor != 4
-#ifdef POLYOBJECTS
- && player->onconveyor != 1
-#endif
- )
+ else if (player->onconveyor != 2 && player->onconveyor != 4 && player->onconveyor != 1)
player->cmomx = player->cmomy = 0;
player->rmomx = player->mo->momx - player->cmomx;
@@ -10235,7 +10225,6 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
}
}
-#ifdef POLYOBJECTS
// Check polyobjects and see if floorz/ceilingz need to be altered
{
INT32 xl, xh, yl, yh, bx, by;
@@ -10314,7 +10303,6 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
}
}
}
-#endif
// crushed camera
if (myceilingz <= myfloorz + thiscam->height && !resetcalled && !cameranoclip)
@@ -11725,10 +11713,8 @@ void P_PlayerThink(player_t *player)
P_MobjCheckWater(player->mo);
#ifndef SECTORSPECIALSAFTERTHINK
-#ifdef POLYOBJECTS
if (player->onconveyor != 1 || !P_IsObjectOnGround(player->mo))
-#endif
- player->onconveyor = 0;
+ player->onconveyor = 0;
// check special sectors : damage & secrets
if (!player->spectator)
@@ -12086,12 +12072,10 @@ void P_PlayerThink(player_t *player)
// it lasts for one tic.
player->pflags &= ~PF_FULLSTASIS;
-#ifdef POLYOBJECTS
if (player->onconveyor == 1)
player->onconveyor = 3;
else if (player->onconveyor == 3)
player->cmomy = player->cmomx = 0;
-#endif
P_DoSuperStuff(player);
P_CheckSneakerAndLivesTimer(player);
@@ -12424,10 +12408,8 @@ void P_PlayerAfterThink(player_t *player)
cmd = &player->cmd;
#ifdef SECTORSPECIALSAFTERTHINK
-#ifdef POLYOBJECTS
if (player->onconveyor != 1 || !P_IsObjectOnGround(player->mo))
-#endif
- player->onconveyor = 0;
+ player->onconveyor = 0;
// check special sectors : damage & secrets
if (!player->spectator)
diff --git a/src/r_bsp.c b/src/r_bsp.c
index 77ab2a82f6b1d4901d7a5526a982f6377a3c3a64..3bd023dbf1012bd0315f927d2b8c4fbb739ba355 100644
--- a/src/r_bsp.c
+++ b/src/r_bsp.c
@@ -354,9 +354,7 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
boolean R_IsEmptyLine(seg_t *line, sector_t *front, sector_t *back)
{
return (
-#ifdef POLYOBJECTS
!line->polyseg &&
-#endif
back->ceilingpic == front->ceilingpic
&& back->floorpic == front->floorpic
&& back->f_slope == front->f_slope
@@ -482,13 +480,10 @@ static void R_AddLine(seg_t *line)
if (bothceilingssky && bothfloorssky) // everything's sky? let's save us a bit of time then
{
- if (
-#ifdef POLYOBJECTS
- !line->polyseg &&
-#endif
- !line->sidedef->midtexture
- && ((!frontsector->ffloors && !backsector->ffloors)
- || (frontsector->tag == backsector->tag)))
+ if (!line->polyseg &&
+ !line->sidedef->midtexture
+ && ((!frontsector->ffloors && !backsector->ffloors)
+ || (frontsector->tag == backsector->tag)))
return; // line is empty, don't even bother
goto clippass; // treat like wide open window instead
@@ -654,8 +649,6 @@ static boolean R_CheckBBox(const fixed_t *bspcoord)
return true;
}
-#ifdef POLYOBJECTS
-
size_t numpolys; // number of polyobjects in current subsector
size_t num_po_ptrs; // number of polyobject pointers allocated
polyobj_t **po_ptrs; // temp ptr array to sort polyobject pointers
@@ -819,7 +812,6 @@ static void R_AddPolyObjects(subsector_t *sub)
R_AddLine(po_ptrs[i]->segs[j]);
}
}
-#endif
//
// R_Subsector
@@ -896,11 +888,7 @@ static void R_Subsector(size_t num)
|| (frontsector->heightsec != -1 && sectors[frontsector->heightsec].ceilingpic == skyflatnum))
{
floorplane = R_FindPlane(frontsector->floorheight, frontsector->floorpic, floorlightlevel,
- frontsector->floor_xoffs, frontsector->floor_yoffs, frontsector->floorpic_angle, floorcolormap, NULL
-#ifdef POLYOBJECTS_PLANES
- , NULL
-#endif
- , frontsector->f_slope);
+ frontsector->floor_xoffs, frontsector->floor_yoffs, frontsector->floorpic_angle, floorcolormap, NULL, NULL, frontsector->f_slope);
}
else
floorplane = NULL;
@@ -911,11 +899,7 @@ static void R_Subsector(size_t num)
{
ceilingplane = R_FindPlane(frontsector->ceilingheight, frontsector->ceilingpic,
ceilinglightlevel, frontsector->ceiling_xoffs, frontsector->ceiling_yoffs, frontsector->ceilingpic_angle,
- ceilingcolormap, NULL
-#ifdef POLYOBJECTS_PLANES
- , NULL
-#endif
- , frontsector->c_slope);
+ ceilingcolormap, NULL, NULL, frontsector->c_slope);
}
else
ceilingplane = NULL;
@@ -963,11 +947,7 @@ static void R_Subsector(size_t num)
ffloor[numffloors].plane = R_FindPlane(*rover->bottomheight, *rover->bottompic,
*frontsector->lightlist[light].lightlevel, *rover->bottomxoffs,
- *rover->bottomyoffs, *rover->bottomangle, *frontsector->lightlist[light].extra_colormap, rover
-#ifdef POLYOBJECTS_PLANES
- , NULL
-#endif
- , *rover->b_slope);
+ *rover->bottomyoffs, *rover->bottomangle, *frontsector->lightlist[light].extra_colormap, rover, NULL, *rover->b_slope);
ffloor[numffloors].slope = *rover->b_slope;
@@ -1000,11 +980,7 @@ static void R_Subsector(size_t num)
ffloor[numffloors].plane = R_FindPlane(*rover->topheight, *rover->toppic,
*frontsector->lightlist[light].lightlevel, *rover->topxoffs, *rover->topyoffs, *rover->topangle,
- *frontsector->lightlist[light].extra_colormap, rover
-#ifdef POLYOBJECTS_PLANES
- , NULL
-#endif
- , *rover->t_slope);
+ *frontsector->lightlist[light].extra_colormap, rover, NULL, *rover->t_slope);
ffloor[numffloors].slope = *rover->t_slope;
@@ -1019,7 +995,6 @@ static void R_Subsector(size_t num)
}
}
-#ifdef POLYOBJECTS_PLANES
// Polyobjects have planes, too!
if (sub->polyList)
{
@@ -1085,7 +1060,6 @@ static void R_Subsector(size_t num)
po = (polyobj_t *)(po->link.next);
}
}
-#endif
#ifdef FLOORSPLATS
if (sub->splats)
@@ -1108,21 +1082,15 @@ static void R_Subsector(size_t num)
firstseg = NULL;
-#ifdef POLYOBJECTS
// haleyjd 02/19/06: draw polyobjects before static lines
if (sub->polyList)
R_AddPolyObjects(sub);
-#endif
while (count--)
{
// CONS_Debug(DBG_GAMELOGIC, "Adding normal line %d...(%d)\n", line->linedef-lines, leveltime);
- if (!line->glseg
-#ifdef POLYOBJECTS
- && !line->polyseg // ignore segs that belong to polyobjects
-#endif
- )
- R_AddLine(line);
+ if (!line->glseg && !line->polyseg) // ignore segs that belong to polyobjects
+ R_AddLine(line);
line++;
curline = NULL; /* cph 2001/11/18 - must clear curline now we're done with it, so stuff doesn't try using it for other things */
}
diff --git a/src/r_bsp.h b/src/r_bsp.h
index 1562b79f6333bffabba3fd3c3f26d0f3015e8ae2..e2da8ebaf54e2226140ee008897d0eefb2432751 100644
--- a/src/r_bsp.h
+++ b/src/r_bsp.h
@@ -40,13 +40,11 @@ void R_PortalClearClipSegs(INT32 start, INT32 end);
void R_ClearDrawSegs(void);
void R_RenderBSPNode(INT32 bspnum);
-#ifdef POLYOBJECTS
void R_SortPolyObjects(subsector_t *sub);
extern size_t numpolys; // number of polyobjects in current subsector
extern size_t num_po_ptrs; // number of polyobject pointers allocated
extern polyobj_t **po_ptrs; // temp ptr array to sort polyobject pointers
-#endif
sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
INT32 *ceilinglightlevel, boolean back);
diff --git a/src/r_defs.h b/src/r_defs.h
index 4a8f5be340d949e59a14dbd341a165baf55dda48..a36568192ebbd320a58b88a58c079e15ba76d833 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -28,8 +28,6 @@
#include "m_aatree.h"
#endif
-#define POLYOBJECTS
-
//
// ClipWallSegment
// Clips the given range of columns
@@ -107,9 +105,7 @@ typedef struct
fixed_t z; ///< Z coordinate.
} degenmobj_t;
-#ifdef POLYOBJECTS
#include "p_polyobj.h"
-#endif
// Store fake planes in a resizable array insted of just by
// heightsec. Allows for multiple fake planes.
@@ -434,9 +430,7 @@ typedef struct line_s
void *splats; // wallsplat_t list
#endif
INT32 firsttag, nexttag; // improves searches for tags.
-#ifdef POLYOBJECTS
polyobj_t *polyobj; // Belongs to a polyobject?
-#endif
char *text; // a concatenation of all front and back texture names, for linedef specials that require a string.
INT16 callcount; // no. of calls left before triggering, for the "X calls" linedef specials, defaults to 0
@@ -479,9 +473,7 @@ typedef struct subsector_s
sector_t *sector;
INT16 numlines;
UINT16 firstline;
-#ifdef POLYOBJECTS
struct polyobj_s *polyList; // haleyjd 02/19/06: list of polyobjects
-#endif
#if 1//#ifdef FLOORSPLATS
void *splats; // floorsplat_t list
#endif
@@ -584,10 +576,8 @@ typedef struct seg_s
// Why slow things down by calculating lightlists for every thick side?
size_t numlights;
r_lightlist_t *rlights;
-#ifdef POLYOBJECTS
polyobj_t *polyseg;
boolean dontrenderme;
-#endif
boolean glseg;
} seg_t;
diff --git a/src/r_plane.c b/src/r_plane.c
index ca5aa758e6d49d371b0e1b818574696b3f7e8b18..9b5a943408d1b06139cc6a97c5f7fb62ae9d0875 100644
--- a/src/r_plane.c
+++ b/src/r_plane.c
@@ -337,11 +337,7 @@ static visplane_t *new_visplane(unsigned hash)
//
visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
fixed_t xoff, fixed_t yoff, angle_t plangle, extracolormap_t *planecolormap,
- ffloor_t *pfloor
-#ifdef POLYOBJECTS_PLANES
- , polyobj_t *polyobj
-#endif
- , pslope_t *slope)
+ ffloor_t *pfloor, polyobj_t *polyobj, pslope_t *slope)
{
visplane_t *check;
unsigned hash;
@@ -361,7 +357,6 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
}
}
-#ifdef POLYOBJECTS_PLANES
if (polyobj)
{
if (polyobj->angle != 0)
@@ -376,7 +371,6 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
yoff += polyobj->centerPt.y;
}
}
-#endif
// This appears to fix the Nimbus Ruins sky bug.
if (picnum == skyflatnum && pfloor)
@@ -390,12 +384,10 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
for (check = visplanes[hash]; check; check = check->next)
{
-#ifdef POLYOBJECTS_PLANES
if (check->polyobj && pfloor)
continue;
if (polyobj != check->polyobj)
continue;
-#endif
if (height == check->height && picnum == check->picnum
&& lightlevel == check->lightlevel
&& xoff == check->xoffs && yoff == check->yoffs
@@ -426,9 +418,7 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
check->viewz = viewz;
check->viewangle = viewangle;
check->plangle = plangle;
-#ifdef POLYOBJECTS_PLANES
check->polyobj = polyobj;
-#endif
check->slope = slope;
memset(check->top, 0xff, sizeof (check->top));
@@ -496,9 +486,7 @@ visplane_t *R_CheckPlane(visplane_t *pl, INT32 start, INT32 stop)
new_pl->viewz = pl->viewz;
new_pl->viewangle = pl->viewangle;
new_pl->plangle = pl->plangle;
-#ifdef POLYOBJECTS_PLANES
new_pl->polyobj = pl->polyobj;
-#endif
new_pl->slope = pl->slope;
pl = new_pl;
pl->minx = start;
@@ -523,11 +511,9 @@ void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop)
// INT32 unionl, unionh;
// INT32 x;
-#ifdef POLYOBJECTS_PLANES
// Don't expand polyobject planes here - we do that on our own.
if (pl->polyobj)
return;
-#endif
if (pl->minx > start) pl->minx = start;
if (pl->maxx < stop) pl->maxx = stop;
@@ -603,11 +589,7 @@ void R_DrawPlanes(void)
{
for (pl = visplanes[i]; pl; pl = pl->next)
{
- if (pl->ffloor != NULL
-#ifdef POLYOBJECTS_PLANES
- || pl->polyobj != NULL
-#endif
- )
+ if (pl->ffloor != NULL || pl->polyobj != NULL)
continue;
R_DrawSinglePlane(pl);
@@ -961,7 +943,6 @@ void R_DrawSinglePlane(visplane_t *pl)
#endif
spanfunc = spanfuncs[BASEDRAWFUNC];
-#ifdef POLYOBJECTS_PLANES
if (pl->polyobj && pl->polyobj->translucency != 0)
{
spanfunctype = SPANDRAWFUNC_TRANS;
@@ -979,95 +960,98 @@ void R_DrawSinglePlane(visplane_t *pl)
else
light = LIGHTLEVELS-1;
- } else
-#endif
- if (pl->ffloor)
+ }
+ else
{
- // Don't draw planes that shouldn't be drawn.
- for (rover = pl->ffloor->target->ffloors; rover; rover = rover->next)
+ if (pl->ffloor)
{
- if ((pl->ffloor->flags & FF_CUTEXTRA) && (rover->flags & FF_EXTRA))
+ // Don't draw planes that shouldn't be drawn.
+ for (rover = pl->ffloor->target->ffloors; rover; rover = rover->next)
{
- if (pl->ffloor->flags & FF_EXTRA)
+ if ((pl->ffloor->flags & FF_CUTEXTRA) && (rover->flags & FF_EXTRA))
{
- // The plane is from an extra 3D floor... Check the flags so
- // there are no undesired cuts.
- if (((pl->ffloor->flags & (FF_FOG|FF_SWIMMABLE)) == (rover->flags & (FF_FOG|FF_SWIMMABLE)))
- && pl->height < *rover->topheight
- && pl->height > *rover->bottomheight)
- return;
+ if (pl->ffloor->flags & FF_EXTRA)
+ {
+ // The plane is from an extra 3D floor... Check the flags so
+ // there are no undesired cuts.
+ if (((pl->ffloor->flags & (FF_FOG|FF_SWIMMABLE)) == (rover->flags & (FF_FOG|FF_SWIMMABLE)))
+ && pl->height < *rover->topheight
+ && pl->height > *rover->bottomheight)
+ return;
+ }
}
}
- }
- if (pl->ffloor->flags & FF_TRANSLUCENT)
- {
- spanfunctype = SPANDRAWFUNC_TRANS;
-
- // Hacked up support for alpha value in software mode Tails 09-24-2002
- if (pl->ffloor->alpha < 12)
- return; // Don't even draw it
- else if (pl->ffloor->alpha < 38)
- ds_transmap = transtables + ((tr_trans90-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 64)
- ds_transmap = transtables + ((tr_trans80-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 89)
- ds_transmap = transtables + ((tr_trans70-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 115)
- ds_transmap = transtables + ((tr_trans60-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 140)
- ds_transmap = transtables + ((tr_trans50-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 166)
- ds_transmap = transtables + ((tr_trans40-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 192)
- ds_transmap = transtables + ((tr_trans30-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 217)
- ds_transmap = transtables + ((tr_trans20-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 243)
- ds_transmap = transtables + ((tr_trans10-1)<<FF_TRANSSHIFT);
- else // Opaque, but allow transparent flat pixels
- spanfunctype = SPANDRAWFUNC_SPLAT;
-
- if ((spanfunctype == SPANDRAWFUNC_SPLAT) || (pl->extra_colormap && (pl->extra_colormap->flags & CMF_FOG)))
+ if (pl->ffloor->flags & FF_TRANSLUCENT)
+ {
+ spanfunctype = SPANDRAWFUNC_TRANS;
+
+ // Hacked up support for alpha value in software mode Tails 09-24-2002
+ if (pl->ffloor->alpha < 12)
+ return; // Don't even draw it
+ else if (pl->ffloor->alpha < 38)
+ ds_transmap = transtables + ((tr_trans90-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 64)
+ ds_transmap = transtables + ((tr_trans80-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 89)
+ ds_transmap = transtables + ((tr_trans70-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 115)
+ ds_transmap = transtables + ((tr_trans60-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 140)
+ ds_transmap = transtables + ((tr_trans50-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 166)
+ ds_transmap = transtables + ((tr_trans40-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 192)
+ ds_transmap = transtables + ((tr_trans30-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 217)
+ ds_transmap = transtables + ((tr_trans20-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 243)
+ ds_transmap = transtables + ((tr_trans10-1)<<FF_TRANSSHIFT);
+ else // Opaque, but allow transparent flat pixels
+ spanfunctype = SPANDRAWFUNC_SPLAT;
+
+ if ((spanfunctype == SPANDRAWFUNC_SPLAT) || (pl->extra_colormap && (pl->extra_colormap->flags & CMF_FOG)))
+ light = (pl->lightlevel >> LIGHTSEGSHIFT);
+ else
+ light = LIGHTLEVELS-1;
+ }
+ else if (pl->ffloor->flags & FF_FOG)
+ {
+ spanfunctype = SPANDRAWFUNC_FOG;
light = (pl->lightlevel >> LIGHTSEGSHIFT);
- else
- light = LIGHTLEVELS-1;
- }
- else if (pl->ffloor->flags & FF_FOG)
- {
- spanfunctype = SPANDRAWFUNC_FOG;
- light = (pl->lightlevel >> LIGHTSEGSHIFT);
- }
- else light = (pl->lightlevel >> LIGHTSEGSHIFT);
-
-#ifndef NOWATER
- if (pl->ffloor->flags & FF_RIPPLE)
- {
- INT32 top, bottom;
+ }
+ else light = (pl->lightlevel >> LIGHTSEGSHIFT);
- itswater = true;
- if (spanfunctype == SPANDRAWFUNC_TRANS)
+ #ifndef NOWATER
+ if (pl->ffloor->flags & FF_RIPPLE)
{
- spanfunctype = SPANDRAWFUNC_WATER;
+ INT32 top, bottom;
+
+ itswater = true;
+ if (spanfunctype == SPANDRAWFUNC_TRANS)
+ {
+ spanfunctype = SPANDRAWFUNC_WATER;
- // Copy the current scene, ugh
- top = pl->high-8;
- bottom = pl->low+8;
+ // Copy the current scene, ugh
+ top = pl->high-8;
+ bottom = pl->low+8;
- if (top < 0)
- top = 0;
- if (bottom > vid.height)
- bottom = vid.height;
+ if (top < 0)
+ top = 0;
+ if (bottom > vid.height)
+ bottom = vid.height;
- // Only copy the part of the screen we need
- VID_BlitLinearScreen((splitscreen && viewplayer == &players[secondarydisplayplayer]) ? screens[0] + (top+(vid.height>>1))*vid.width : screens[0]+((top)*vid.width), screens[1]+((top)*vid.width),
- vid.width, bottom-top,
- vid.width, vid.width);
+ // Only copy the part of the screen we need
+ VID_BlitLinearScreen((splitscreen && viewplayer == &players[secondarydisplayplayer]) ? screens[0] + (top+(vid.height>>1))*vid.width : screens[0]+((top)*vid.width), screens[1]+((top)*vid.width),
+ vid.width, bottom-top,
+ vid.width, vid.width);
+ }
}
+ #endif
}
-#endif
+ else
+ light = (pl->lightlevel >> LIGHTSEGSHIFT);
}
- else light = (pl->lightlevel >> LIGHTSEGSHIFT);
if (!pl->slope // Don't mess with angle on slopes! We'll handle this ourselves later
&& viewangle != pl->viewangle+pl->plangle)
diff --git a/src/r_plane.h b/src/r_plane.h
index a1a5b7a78388bb7c835ab4763329731514f990a2..67fa19f38bedd3535f6ad1ec6f501139aa8bd426 100644
--- a/src/r_plane.h
+++ b/src/r_plane.h
@@ -47,9 +47,7 @@ typedef struct visplane_s
fixed_t xoffs, yoffs; // Scrolling flats.
struct ffloor_s *ffloor;
-#ifdef POLYOBJECTS_PLANES
polyobj_t *polyobj;
-#endif
pslope_t *slope;
} visplane_t;
@@ -80,11 +78,7 @@ void R_MapPlane(INT32 y, INT32 x1, INT32 x2);
void R_MakeSpans(INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2);
void R_DrawPlanes(void);
visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel, fixed_t xoff, fixed_t yoff, angle_t plangle,
- extracolormap_t *planecolormap, ffloor_t *ffloor
-#ifdef POLYOBJECTS_PLANES
- , polyobj_t *polyobj
-#endif
- , pslope_t *slope);
+ extracolormap_t *planecolormap, ffloor_t *ffloor, polyobj_t *polyobj, pslope_t *slope);
visplane_t *R_CheckPlane(visplane_t *pl, INT32 start, INT32 stop);
void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop);
void R_PlaneBounds(visplane_t *plane);
@@ -112,9 +106,7 @@ typedef struct planemgr_s
struct pslope_s *slope;
struct ffloor_s *ffloor;
-#ifdef POLYOBJECTS_PLANES
polyobj_t *polyobj;
-#endif
} visffloor_t;
extern visffloor_t ffloor[MAXFFLOORS];
diff --git a/src/r_segs.c b/src/r_segs.c
index b6b4ca44cba37c8f79d4ed4bfac0c3f82d7367ba..6a838be79434b570b10fb2932c00b611a4b4a49a 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -610,7 +610,6 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
// draw the texture
col = (column_t *)((UINT8 *)R_GetColumn(texnum, maskedtexturecol[dc_x]) - 3);
-//#ifdef POLYOBJECTS_PLANES
#if 0 // Disabling this allows inside edges to render below the planes, for until the clipping is fixed to work right when POs are near the camera. -Red
if (curline->dontrenderme && curline->polyseg && (curline->polyseg->flags & POF_RENDERPLANES))
{
@@ -1309,10 +1308,8 @@ static void R_RenderSegLoop (void)
for (i = 0; i < numffloors; i++)
{
-#ifdef POLYOBJECTS_PLANES
if (ffloor[i].polyobj && (!curline->polyseg || ffloor[i].polyobj != curline->polyseg))
continue;
-#endif
if (ffloor[i].height < viewz)
{
@@ -1325,18 +1322,19 @@ static void R_RenderSegLoop (void)
if (bottom_w > bottom)
bottom_w = bottom;
-#ifdef POLYOBJECTS_PLANES
// Polyobject-specific hack to fix plane leaking -Red
- if (ffloor[i].polyobj && top_w >= bottom_w) {
+ if (ffloor[i].polyobj && top_w >= bottom_w)
+ {
ffloor[i].plane->top[rw_x] = 0xFFFF;
ffloor[i].plane->bottom[rw_x] = 0x0000; // fix for sky plane drawing crashes - Monster Iestyn 25/05/18
- } else
-#endif
-
- if (top_w <= bottom_w)
+ }
+ else
{
- ffloor[i].plane->top[rw_x] = (INT16)top_w;
- ffloor[i].plane->bottom[rw_x] = (INT16)bottom_w;
+ if (top_w <= bottom_w)
+ {
+ ffloor[i].plane->top[rw_x] = (INT16)top_w;
+ ffloor[i].plane->bottom[rw_x] = (INT16)bottom_w;
+ }
}
}
else if (ffloor[i].height > viewz)
@@ -1350,18 +1348,19 @@ static void R_RenderSegLoop (void)
if (bottom_w > bottom)
bottom_w = bottom;
-#ifdef POLYOBJECTS_PLANES
// Polyobject-specific hack to fix plane leaking -Red
- if (ffloor[i].polyobj && top_w >= bottom_w) {
+ if (ffloor[i].polyobj && top_w >= bottom_w)
+ {
ffloor[i].plane->top[rw_x] = 0xFFFF;
ffloor[i].plane->bottom[rw_x] = 0x0000; // fix for sky plane drawing crashes - Monster Iestyn 25/05/18
- } else
-#endif
-
- if (top_w <= bottom_w)
+ }
+ else
{
- ffloor[i].plane->top[rw_x] = (INT16)top_w;
- ffloor[i].plane->bottom[rw_x] = (INT16)bottom_w;
+ if (top_w <= bottom_w)
+ {
+ ffloor[i].plane->top[rw_x] = (INT16)top_w;
+ ffloor[i].plane->bottom[rw_x] = (INT16)bottom_w;
+ }
}
}
}
@@ -1818,10 +1817,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
{
for (i = 0; i < numffloors; i++)
{
-#ifdef POLYOBJECTS_PLANES
if (ffloor[i].polyobj && (!ds_p->curline->polyseg || ffloor[i].polyobj != ds_p->curline->polyseg))
continue;
-#endif
if (ffloor[i].slope) {
ffloor[i].f_pos = P_GetZAt(ffloor[i].slope, segleft.x, segleft.y) - viewz;
@@ -2328,33 +2325,40 @@ void R_StoreWallRange(INT32 start, INT32 stop)
maskedtextureheight = ds_p->maskedtextureheight; // note to red, this == &(ds_p->maskedtextureheight[0])
-#ifdef POLYOBJECTS
- if (curline->polyseg) { // use REAL front and back floors please, so midtexture rendering isn't mucked up
+ if (curline->polyseg)
+ { // use REAL front and back floors please, so midtexture rendering isn't mucked up
rw_midtextureslide = rw_midtexturebackslide = 0;
if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3))
rw_midtexturemid = rw_midtextureback = max(curline->frontsector->floorheight, curline->backsector->floorheight) - viewz;
else
rw_midtexturemid = rw_midtextureback = min(curline->frontsector->ceilingheight, curline->backsector->ceilingheight) - viewz;
- } else
-#endif
- // Set midtexture starting height
- if (linedef->flags & ML_EFFECT2) { // Ignore slopes when texturing
- rw_midtextureslide = rw_midtexturebackslide = 0;
- if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3))
- rw_midtexturemid = rw_midtextureback = max(frontsector->floorheight, backsector->floorheight) - viewz;
+ }
+ else
+ {
+ // Set midtexture starting height
+ if (linedef->flags & ML_EFFECT2)
+ { // Ignore slopes when texturing
+ rw_midtextureslide = rw_midtexturebackslide = 0;
+ if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3))
+ rw_midtexturemid = rw_midtextureback = max(frontsector->floorheight, backsector->floorheight) - viewz;
+ else
+ rw_midtexturemid = rw_midtextureback = min(frontsector->ceilingheight, backsector->ceilingheight) - viewz;
+
+ }
+ else if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3))
+ {
+ rw_midtexturemid = worldbottom;
+ rw_midtextureslide = floorfrontslide;
+ rw_midtextureback = worldlow;
+ rw_midtexturebackslide = floorbackslide;
+ }
else
- rw_midtexturemid = rw_midtextureback = min(frontsector->ceilingheight, backsector->ceilingheight) - viewz;
-
- } else if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3)) {
- rw_midtexturemid = worldbottom;
- rw_midtextureslide = floorfrontslide;
- rw_midtextureback = worldlow;
- rw_midtexturebackslide = floorbackslide;
- } else {
- rw_midtexturemid = worldtop;
- rw_midtextureslide = ceilingfrontslide;
- rw_midtextureback = worldhigh;
- rw_midtexturebackslide = ceilingbackslide;
+ {
+ rw_midtexturemid = worldtop;
+ rw_midtextureslide = ceilingfrontslide;
+ rw_midtextureback = worldhigh;
+ rw_midtexturebackslide = ceilingbackslide;
+ }
}
rw_midtexturemid += sidedef->rowoffset;
rw_midtextureback += sidedef->rowoffset;
@@ -2711,7 +2715,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
}
}
}
-#ifdef POLYOBJECTS_PLANES
if (curline->polyseg && frontsector && (curline->polyseg->flags & POF_RENDERPLANES))
{
while (i < numffloors && ffloor[i].polyobj != curline->polyseg) i++;
@@ -2750,7 +2753,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
i++;
}
}
-#endif
numbackffloors = i;
}
@@ -2804,7 +2806,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
for (i = 0; i < numffloors; i++)
R_ExpandPlane(ffloor[i].plane, rw_x, rw_stopx - 1);
}
-#ifdef POLYOBJECTS_PLANES
// FIXME hack to fix planes disappearing when a seg goes behind the camera. This NEEDS to be changed to be done properly. -Red
if (curline->polyseg)
{
@@ -2819,7 +2820,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
ffloor[i].plane->maxx = rw_stopx - 1;
}
}
-#endif
}
#ifdef WALLSPLATS
diff --git a/src/r_things.c b/src/r_things.c
index b4ffd4408883aa7dd24e88841eeadda969ed53ae..361cb1961b2e6501900fdea49d264e203f1a62ec 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -1140,7 +1140,6 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope)
}
#if 0 // Unfortunately, this drops CEZ2 down to sub-17 FPS on my i7.
-//#ifdef POLYOBJECTS
// Check polyobjects and see if floorz needs to be altered, for rings only because they don't update floorz
if (thing->type == MT_RING)
{
@@ -2271,7 +2270,6 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
entry->ffloor = ds->thicksides[i];
}
}
-#ifdef POLYOBJECTS_PLANES
// Check for a polyobject plane, but only if this is a front line
if (ds->curline->polyseg && ds->curline->polyseg->visplane && !ds->curline->side) {
plane = ds->curline->polyseg->visplane;
@@ -2287,7 +2285,6 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
}
ds->curline->polyseg->visplane = NULL;
}
-#endif
if (ds->maskedtexturecol)
{
entry = R_CreateDrawNode(head);
@@ -2335,7 +2332,6 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
if (tempskip)
return;
-#ifdef POLYOBJECTS_PLANES
// find all the remaining polyobject planes and add them on the end of the list
// probably this is a terrible idea if we wanted them to be sorted properly
// but it works getting them in for now
@@ -2356,7 +2352,6 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
// note: no seg is set, for what should be obvious reasons
PolyObjects[i].visplane = NULL;
}
-#endif
// No vissprites in this mask?
if (mask->vissprites[1] - mask->vissprites[0] == 0)