diff --git a/src/p_mobj.c b/src/p_mobj.c index 2cb12791..d19bdd18 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -1938,7 +1938,9 @@ void P_XYMovement(mobj_t *mo) FIXED_TO_FLOAT(AngleFixed(newangle)), FIXED_TO_FLOAT(AngleFixed(oldangle-newangle)) );*/ - } else if (predictedz-mo->z > abs(slopemom.z/2)) { // Now check if we were supposed to stick to this slope + // Sryder 2018-11-26: Don't launch here if it's a slope without physics, we stick to those like glue anyway + } else if (predictedz-mo->z > abs(slopemom.z/2) + && !(mo->standingslope->flags & SL_NOPHYSICS)) { // Now check if we were supposed to stick to this slope //CONS_Printf("%d-%d > %d\n", (predictedz), (mo->z), (slopemom.z/2)); P_SlopeLaunch(mo); } diff --git a/src/p_slopes.c b/src/p_slopes.c index ea85f797..26b3657f 100644 --- a/src/p_slopes.c +++ b/src/p_slopes.c @@ -812,10 +812,10 @@ void P_SlopeLaunch(mobj_t *mo) mo->momy = slopemom.y; mo->momz = slopemom.z; #endif + } //CONS_Printf("Launched off of slope.\n"); mo->standingslope = NULL; - } } // Function to help handle landing on slopes