Removing unused cruft
This commit is contained in:
RedEnchilada
parent
6fa1448f59
commit
0c477c685d
|
|
@ -115,19 +115,6 @@ static pslope_t *P_MakeSlope(const v3fixed_t *o, const v2fixed_t *d,
|
|||
return ret;
|
||||
}
|
||||
|
||||
//
|
||||
// P_CopySlope
|
||||
//
|
||||
// Allocates and returns a copy of the given slope structure.
|
||||
//
|
||||
static pslope_t *P_CopySlope(const pslope_t *src)
|
||||
{
|
||||
pslope_t *ret = Z_Malloc(sizeof(pslope_t), PU_LEVEL, NULL);
|
||||
memcpy(ret, src, sizeof(*ret));
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
//
|
||||
// P_GetExtent
|
||||
//
|
||||
|
|
@ -471,7 +458,6 @@ void P_CopySectorSlope(line_t *line)
|
|||
fsec->c_slope = srcsec->c_slope; //P_CopySlope(srcsec->c_slope);
|
||||
}
|
||||
|
||||
//SRB2CBTODO: ESLOPE: Maybe we do need it for another to check for a plane slope?
|
||||
line->special = 0; // Linedef was use to set slopes, it finished its job, so now make it a normal linedef
|
||||
}
|
||||
|
||||
|
|
@ -765,7 +751,7 @@ float P_GetZAtf(pslope_t *slope, float x, float y)
|
|||
return slope->of.z + (dist * slope->zdeltaf);
|
||||
}
|
||||
|
||||
//
|
||||
// Unused? -Red
|
||||
// P_DistFromPlanef
|
||||
//
|
||||
float P_DistFromPlanef(const v3float_t *point, const v3float_t *pori,
|
||||
|
|
|
|||
|
|
@ -31,18 +31,12 @@
|
|||
#ifdef ESLOPE
|
||||
void P_ResetDynamicSlopes(void);
|
||||
void P_RunDynamicSlopes(void);
|
||||
|
||||
// P_MakeLineNormal
|
||||
// Calculates a 2D normal for the given line and stores it in the line
|
||||
void P_MakeLineNormal(line_t *line);
|
||||
|
||||
|
||||
// P_SpawnSlope_Line
|
||||
// Creates one or more slopes based on the given line type and front/back
|
||||
// sectors.
|
||||
void P_SpawnSlope_Line(int linenum);
|
||||
|
||||
|
||||
#ifdef SPRINGCLEAN
|
||||
// Loads just map objects that make slopes,
|
||||
// terrain affecting objects have to be spawned first
|
||||
void P_SetSlopesFromVertexHeights(lumpnum_t lumpnum);
|
||||
|
|
@ -60,6 +54,7 @@ typedef enum
|
|||
THING_VertexFloorZ=1504,
|
||||
THING_VertexCeilingZ=1505,
|
||||
} slopething_e;
|
||||
#endif
|
||||
|
||||
//
|
||||
// P_CopySectorSlope
|
||||
|
|
@ -76,6 +71,7 @@ fixed_t P_GetZAt(pslope_t *slope, fixed_t x, fixed_t y);
|
|||
float P_GetZAtf(pslope_t *slope, float x, float y);
|
||||
|
||||
|
||||
// Unused? -Red
|
||||
// Returns the distance of the given point from the given origin and normal.
|
||||
float P_DistFromPlanef(const v3float_t *point, const v3float_t *pori,
|
||||
const v3float_t *pnormal);
|
||||
|
|
|
|||
57
src/p_spec.c
57
src/p_spec.c
|
|
@ -6500,63 +6500,6 @@ void P_SpawnSpecials(INT32 fromnetsave)
|
|||
P_RunLevelLoadExecutors();
|
||||
}
|
||||
|
||||
#ifdef ESLOPE
|
||||
//
|
||||
// P_SpawnDeferredSpecials
|
||||
//
|
||||
// SoM: Specials that copy slopes, ect., need to be collected in a separate
|
||||
// pass
|
||||
// NOTE: SRB2CBTODO: A new function, P_SpawnDeferredSpecials is needed if objects
|
||||
// are to be needed in this function, because this function currently needs to be
|
||||
// done before 'things' are loaded, because slopes are part of this function,
|
||||
// and slope height adjustments are needed for spawning objects
|
||||
void P_SpawnDeferredSpecials(void)
|
||||
{
|
||||
size_t i;
|
||||
line_t *line;
|
||||
|
||||
for(i = 0; i < numlines; i++)
|
||||
{
|
||||
line = lines + i;
|
||||
|
||||
switch(line->special)
|
||||
{
|
||||
// Slopes, Eternity engine
|
||||
/*{ 386, "Slope_FrontsectorFloor" },
|
||||
{ 387, "Slope_FrontsectorCeiling" },
|
||||
{ 388, "Slope_FrontsectorFloorAndCeiling" },
|
||||
{ 389, "Slope_BacksectorFloor" },
|
||||
{ 390, "Slope_BacksectorCeiling" },
|
||||
{ 391, "Slope_BacksectorFloorAndCeiling" },
|
||||
{ 392, "Slope_BackFloorAndFrontCeiling" },
|
||||
{ 393, "Slope_BackCeilingAndFrontFloor" },
|
||||
|
||||
{ 394, "Slope_FrontFloorToTaggedSlope" },
|
||||
{ 395, "Slope_FrontCeilingToTaggedSlope" },
|
||||
{ 396, "Slope_FrontFloorAndCeilingToTaggedSlope" },*/
|
||||
|
||||
// SoM 05/10/09: Slopes // SRB2CBTODO:!
|
||||
case 386:
|
||||
case 387:
|
||||
case 388:
|
||||
case 389:
|
||||
case 390:
|
||||
case 391:
|
||||
case 392:
|
||||
case 393:
|
||||
P_SpawnSlope_Line(i);
|
||||
break;
|
||||
// SoM: Copy slopes
|
||||
case 394:
|
||||
case 395:
|
||||
case 396:
|
||||
P_CopySectorSlope(line);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/** Adds 3Dfloors as appropriate based on a common control linedef.
|
||||
*
|
||||
* \param line Control linedef to use.
|
||||
|
|
|
|||
|
|
@ -36,11 +36,6 @@ void P_SpawnSpecials(INT32 fromnetsave);
|
|||
|
||||
// every tic
|
||||
void P_UpdateSpecials(void);
|
||||
|
||||
#ifdef ESLOPE
|
||||
void P_SpawnDeferredSpecials(void);
|
||||
#endif
|
||||
|
||||
sector_t *P_PlayerTouchingSectorSpecial(player_t *player, INT32 section, INT32 number);
|
||||
void P_PlayerInSpecialSector(player_t *player);
|
||||
void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *roversector);
|
||||
|
|
|
|||
Loading…
Reference in New Issue