lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Start using slope flags/id in creation process

This commit is contained in:
RedEnchilada 2015-08-03 17:39:33 -05:00
parent 049bbce5c0
commit 51284c01d8
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/p_slopes.c
View File

@ -40,7 +40,8 @@
#ifdef ESLOPE #ifdef ESLOPE
static pslope_t *dynslopes = NULL; static pslope_t *slopelist = NULL;
static UINT16 slopecount = 0;
// Calculate line normal // Calculate line normal
void P_CalculateSlopeNormal(pslope_t *slope) { void P_CalculateSlopeNormal(pslope_t *slope) {
@ -53,9 +54,12 @@ void P_CalculateSlopeNormal(pslope_t *slope) {
void P_RunDynamicSlopes(void) { void P_RunDynamicSlopes(void) {
pslope_t *slope; pslope_t *slope;
for (slope = dynslopes; slope; slope = slope->next) { for (slope = slopelist; slope; slope = slope->next) {
fixed_t zdelta; fixed_t zdelta;
if (slope->flags & SL_NODYNAMIC)
continue;
switch(slope->refpos) { switch(slope->refpos) {
case 1: // front floor case 1: // front floor
zdelta = slope->sourceline->backsector->floorheight - slope->sourceline->frontsector->floorheight; zdelta = slope->sourceline->backsector->floorheight - slope->sourceline->frontsector->floorheight;
@ -92,7 +96,7 @@ void P_RunDynamicSlopes(void) {
// Alocates and fill the contents of a slope structure. // Alocates and fill the contents of a slope structure.
// //
static pslope_t *P_MakeSlope(const vector3_t *o, const vector2_t *d, static pslope_t *P_MakeSlope(const vector3_t *o, const vector2_t *d,
const fixed_t zdelta, boolean dynamic) const fixed_t zdelta, UINT8 flags)
{ {
pslope_t *ret = Z_Malloc(sizeof(pslope_t), PU_LEVEL, NULL); pslope_t *ret = Z_Malloc(sizeof(pslope_t), PU_LEVEL, NULL);
memset(ret, 0, sizeof(*ret)); memset(ret, 0, sizeof(*ret));
@ -106,10 +110,14 @@ static pslope_t *P_MakeSlope(const vector3_t *o, const vector2_t *d,
ret->zdelta = zdelta; ret->zdelta = zdelta;
if (dynamic) { // Add to the dynamic slopes list ret->flags = flags;
ret->next = dynslopes;
dynslopes = ret; // Add to the slope list
} ret->next = slopelist;
slopelist = ret;
slopecount++;
ret->id = slopecount;
return ret; return ret;
} }
@ -179,6 +187,14 @@ void P_SpawnSlope_Line(int linenum)
boolean frontceil = (special == 701 || special == 702 || special == 713); boolean frontceil = (special == 701 || special == 702 || special == 713);
boolean backceil = (special == 711 || special == 712 || special == 703); boolean backceil = (special == 711 || special == 712 || special == 703);
UINT8 flags = 0; // Slope flags
if (line->flags & ML_NOSONIC)
flags |= SL_NOPHYSICS;
if (line->flags & ML_NOTAILS)
flags |= SL_NODYNAMIC;
if (line->flags & ML_NOKNUX)
flags |= SL_ANCHORVERTEX;
if(!frontfloor && !backfloor && !frontceil && !backceil) if(!frontfloor && !backfloor && !frontceil && !backceil)
{ {
CONS_Printf("P_SpawnSlope_Line called with non-slope line special.\n"); CONS_Printf("P_SpawnSlope_Line called with non-slope line special.\n");
@ -235,7 +251,7 @@ void P_SpawnSlope_Line(int linenum)
// In P_SpawnSlopeLine the origin is the centerpoint of the sourcelinedef // In P_SpawnSlopeLine the origin is the centerpoint of the sourcelinedef
fslope = line->frontsector->f_slope = fslope = line->frontsector->f_slope =
P_MakeSlope(&point, &direction, dz, !(line->flags & ML_NOTAILS)); P_MakeSlope(&point, &direction, dz, flags);
// Set up some shit // Set up some shit
fslope->extent = extent; fslope->extent = extent;
@ -291,7 +307,7 @@ void P_SpawnSlope_Line(int linenum)
dz = FixedDiv(origin.z - point.z, extent); dz = FixedDiv(origin.z - point.z, extent);
cslope = line->frontsector->c_slope = cslope = line->frontsector->c_slope =
P_MakeSlope(&point, &direction, dz, !(line->flags & ML_NOTAILS)); P_MakeSlope(&point, &direction, dz, flags);
// Set up some shit // Set up some shit
cslope->extent = extent; cslope->extent = extent;
@ -356,7 +372,7 @@ void P_SpawnSlope_Line(int linenum)
dz = FixedDiv(origin.z - point.z, extent); dz = FixedDiv(origin.z - point.z, extent);
fslope = line->backsector->f_slope = fslope = line->backsector->f_slope =
P_MakeSlope(&point, &direction, dz, !(line->flags & ML_NOTAILS)); P_MakeSlope(&point, &direction, dz, flags);
// Set up some shit // Set up some shit
fslope->extent = extent; fslope->extent = extent;
@ -398,7 +414,7 @@ void P_SpawnSlope_Line(int linenum)
dz = FixedDiv(origin.z - point.z, extent); dz = FixedDiv(origin.z - point.z, extent);
cslope = line->backsector->c_slope = cslope = line->backsector->c_slope =
P_MakeSlope(&point, &direction, dz, !(line->flags & ML_NOTAILS)); P_MakeSlope(&point, &direction, dz, flags);
// Set up some shit // Set up some shit
cslope->extent = extent; cslope->extent = extent;
@ -730,7 +746,8 @@ void P_ResetDynamicSlopes(void) {
boolean warned = false; boolean warned = false;
#endif #endif
dynslopes = NULL; slopelist = NULL;
slopecount = 0;
// We'll handle copy slopes later, after all the tag lists have been made. // We'll handle copy slopes later, after all the tag lists have been made.
// Yes, this means copied slopes won't affect things' spawning heights. Too bad for you. // Yes, this means copied slopes won't affect things' spawning heights. Too bad for you.