diff --git a/src/dehacked.c b/src/dehacked.c index 8b60ab61..99d95259 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -6704,6 +6704,54 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_KARMAWHEEL", // Karma player wheels + // Thunder shield use stuff; + "S_KSPARK1", // Sparkling Radius + "S_KSPARK2", + "S_KSPARK3", + "S_KSPARK4", + "S_KSPARK5", + "S_KSPARK6", + "S_KSPARK7", + "S_KSPARK8", + "S_KSPARK9", + "S_KSPARK10", + "S_KSPARK11", + "S_KSPARK12", + "S_KSPARK13", // ... that's an awful lot. + + "S_LZIO11", // Straight lightning bolt + "S_LZIO12", + "S_LZIO13", + "S_LZIO14", + "S_LZIO15", + "S_LZIO16", + "S_LZIO17", + "S_LZIO18", + "S_LZIO19", + + "S_LZIO21", // Straight lightning bolt (flipped) + "S_LZIO22", + "S_LZIO23", + "S_LZIO24", + "S_LZIO25", + "S_LZIO26", + "S_LZIO27", + "S_LZIO28", + "S_LZIO29", + + "S_KLIT1", // Diagonal lightning. No, it not being straight doesn't make it gay. + "S_KLIT2", + "S_KLIT3", + "S_KLIT4", + "S_KLIT5", + "S_KLIT6", + "S_KLIT7", + "S_KLIT8", + "S_KLIT9", + "S_KLIT10", + "S_KLIT11", + "S_KLIT12", + #ifdef SEENAMES "S_NAMECHECK", #endif diff --git a/src/info.h b/src/info.h index cfda742c..d0f4be59 100644 --- a/src/info.h +++ b/src/info.h @@ -3557,8 +3557,8 @@ typedef enum state S_KARMAWHEEL, - // Lightning shield use stuff; - S_KSPARK1, // Sparkling Radius + // Thunder shield use stuff; + S_KSPARK1, // Sparkling Radius S_KSPARK2, S_KSPARK3, S_KSPARK4, @@ -3571,7 +3571,7 @@ typedef enum state S_KSPARK11, S_KSPARK12, S_KSPARK13, // ... that's an awful lot. - + S_LZIO11, // Straight lightning bolt S_LZIO12, S_LZIO13, @@ -3581,7 +3581,7 @@ typedef enum state S_LZIO17, S_LZIO18, S_LZIO19, - + S_LZIO21, // Straight lightning bolt (flipped) S_LZIO22, S_LZIO23, @@ -3591,7 +3591,7 @@ typedef enum state S_LZIO27, S_LZIO28, S_LZIO29, - + S_KLIT1, // Diagonal lightning. No, it not being straight doesn't make it gay. S_KLIT2, S_KLIT3, diff --git a/src/p_slopes.c b/src/p_slopes.c index c516fa97..35d4c423 100644 --- a/src/p_slopes.c +++ b/src/p_slopes.c @@ -251,7 +251,7 @@ void P_SpawnSlope_Line(int linenum) UINT8 flags = 0; // Slope flags if (line->flags & ML_NOSONIC) flags |= SL_NOPHYSICS; - if (line->flags & ML_NOTAILS) + if (!(line->flags & ML_NOTAILS)) flags |= SL_NODYNAMIC; if (line->flags & ML_NOKNUX) flags |= SL_ANCHORVERTEX;