stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-03-26 21:01:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert Dynamic slope flag

Browse source
This commit is contained in:
Alug 2024-04-01 14:25:45 +02:00
parent bb305b6c92
commit 017e73a9e9
3 changed files with 12 additions and 12 deletions

4
src/dehacked.c
View file

@ -8543,8 +8543,8 @@ struct {
{"FF_GOOWATER",FF_GOOWATER}, ///< Used with ::FF_SWIMMABLE. Makes thick bouncey goop.
// Slope flags
{"SL_NOPHYSICS",SL_NOPHYSICS},
{"SL_DYNAMIC",SL_DYNAMIC},
{"SL_NOPHYSICS",SL_NOPHYSICS}, // Don't do momentum adjustment with this slope
{"SL_NODYNAMIC",SL_NODYNAMIC}, // Slope will never need to move during the level, so don't fuss with recalculating it
// Angles
{"ANG1",ANG1},

18
src/p_slopes.c
View file

@ -301,8 +301,8 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker)
UINT8 flags = 0; // Slope flags
if (line->flags & ML_NOSONIC)
flags |= SL_NOPHYSICS;
if (line->flags & ML_NOTAILS)
flags |= SL_DYNAMIC;
if (!(line->flags & ML_NOTAILS))
flags |= SL_NODYNAMIC;
if(!frontfloor && !backfloor && !frontceil && !backceil)
{
@ -366,7 +366,7 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker)
P_CalculateSlopeNormal(fslope);
if (spawnthinker && (flags & SL_DYNAMIC))
if (spawnthinker && !(flags & SL_NODYNAMIC))
P_AddDynSlopeThinker(fslope, DP_FRONTFLOOR, line, extent, NULL, NULL);
}
if(frontceil)
@ -383,7 +383,7 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker)
P_CalculateSlopeNormal(cslope);
if (spawnthinker && (flags & SL_DYNAMIC))
if (spawnthinker && !(flags & SL_NODYNAMIC))
P_AddDynSlopeThinker(cslope, DP_FRONTCEIL, line, extent, NULL, NULL);
}
}
@ -423,7 +423,7 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker)
P_CalculateSlopeNormal(fslope);
if (spawnthinker && (flags & SL_DYNAMIC))
if (spawnthinker && !(flags & SL_NODYNAMIC))
P_AddDynSlopeThinker(fslope, DP_BACKFLOOR, line, extent, NULL, NULL);
}
if(backceil)
@ -440,7 +440,7 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker)
P_CalculateSlopeNormal(cslope);
if (spawnthinker && (flags & SL_DYNAMIC))
if (spawnthinker && !(flags & SL_NODYNAMIC))
P_AddDynSlopeThinker(cslope, DP_BACKCEIL, line, extent, NULL, NULL);
}
}
@ -488,7 +488,7 @@ static pslope_t *MakeViaMapthings(INT16 tag1, INT16 tag2, INT16 tag3, UINT8 flag
ReconfigureViaVertexes(ret, vx[0], vx[1], vx[2]);
if (spawnthinker && (flags & SL_DYNAMIC))
if (spawnthinker && !(flags & SL_NODYNAMIC))
P_AddDynSlopeThinker(ret, DP_VERTEX, NULL, 0, tags, vx);
return ret;
@ -505,8 +505,8 @@ static void line_SpawnViaVertexes(const int linenum, const boolean spawnthinker)
UINT8 flags = 0;
if (line->flags & ML_NOSONIC)
flags |= SL_NOPHYSICS;
if (line->flags & ML_NOTAILS)
flags |= SL_DYNAMIC;
if (!(line->flags & ML_NOTAILS))
flags |= SL_NODYNAMIC;
switch(line->special)
{

2
src/r_defs.h
View file

@ -222,7 +222,7 @@ typedef struct linechain_s
// Slopes
typedef enum {
SL_NOPHYSICS = 1, /// This plane will have no physics applied besides the positioning.
SL_DYNAMIC = 1<<1, /// This plane slope will be assigned a thinker to make it dynamic.
SL_NODYNAMIC = 1<<1, // Slope will never need to move during the level, so don't fuss with recalculating it
} slopeflags_t;
typedef struct pslope_s