diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 2bfc47f24..d242d4e71 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -5618,7 +5618,7 @@ static INT16 Consistancy(void) if (TypeIsNetSynced(mo->type) == false) continue; - if (mo->flags & (MF_SPECIAL | MF_SOLID | MF_PUSHABLE | MF_BOSS | MF_MISSILE | MF_SPRING | MF_MONITOR | MF_FIRE | MF_ENEMY | MF_PAIN | MF_STICKY)) + if (mo->flags & (MF_SPECIAL | MF_SOLID | MF_PUSHABLE | MF_BOSS | MF_MISSILE | MF_SPRING | MF_MONITOR | MF_FIRE | MF_ENEMY | MF_PAIN)) { ret -= mo->type; ret += mo->x; diff --git a/src/deh_tables.c b/src/deh_tables.c index 72141e85a..f7de4fa57 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -5993,7 +5993,7 @@ const char *const MOBJFLAG_LIST[] = { "ENEMY", "SCENERY", "PAIN", - "STICKY", + "\x01", // free: 1<<23 (name un-matchable) "APPLYTERRAIN", "NOCLIPTHING", "GRENADEBOUNCE", diff --git a/src/p_mobj.c b/src/p_mobj.c index da1b58d8e..51ac3380e 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -1725,25 +1725,6 @@ void P_XYMovement(mobj_t *mo) P_ExplodeMissile(mo); return; } - else if (mo->flags & MF_STICKY) - { - S_StartSound(mo, mo->info->activesound); - mo->momx = mo->momy = mo->momz = 0; //Full stop! - mo->flags |= MF_NOGRAVITY; //Stay there! - mo->flags &= ~MF_STICKY; //Don't check again! - - // Check for hit against sky here - if (P_CheckSkyHit(mo)) - { - // Hack to prevent missiles exploding - // against the sky. - // Does not handle sky floors. - // Check frontsector as well. - - P_RemoveMobj(mo); - return; - } - } else { boolean walltransferred = false; diff --git a/src/p_mobj.h b/src/p_mobj.h index 382bfcd9e..d15269bb7 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -149,8 +149,7 @@ typedef enum MF_SCENERY = 1<<21, // Painful (shit hurts). MF_PAIN = 1<<22, - // This mobj will stick to any surface or solid object it touches. - MF_STICKY = 1<<23, + // free: 1<<23 // Object uses terrain effects. (Overlays, footsteps, etc) MF_APPLYTERRAIN = 1<<24, // for chase camera, don't be blocked by things (partial clipping) diff --git a/src/r_bbox.c b/src/r_bbox.c index 3654565a8..2e0b345c2 100644 --- a/src/r_bbox.c +++ b/src/r_bbox.c @@ -240,7 +240,7 @@ static boolean is_tangible (mobj_t *thing) // These objects probably do nothing! :D if ((thing->flags & (MF_SPECIAL|MF_SOLID|MF_SHOOTABLE |MF_PUSHABLE|MF_BOSS|MF_MISSILE|MF_SPRING - |MF_MONITOR|MF_ENEMY|MF_PAIN|MF_STICKY + |MF_MONITOR|MF_ENEMY|MF_PAIN |MF_PICKUPFROMBELOW)) == 0U) { return false;