diff --git a/src/deh_tables.c b/src/deh_tables.c index ea5991732..bacb32563 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -5685,7 +5685,7 @@ const char *const MOBJFLAG_LIST[] = { "BOSS", "SPAWNCEILING", "NOGRAVITY", - "AMBIENT", + "\x01", // free: 1<<10 (name un-matchable) "SLIDEME", "NOCLIP", "FLOAT", diff --git a/src/info.c b/src/info.c index cbde12f82..8cfb54d28 100644 --- a/src/info.c +++ b/src/info.c @@ -19016,7 +19016,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 100, // mass 0, // damage sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOGRAVITY|MF_AMBIENT, // flags + MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOGRAVITY, // flags S_NULL // raisestate }, @@ -28256,7 +28256,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 0, // mass 0, // damage sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOGRAVITY|MF_AMBIENT, // flags + MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOGRAVITY, // flags S_NULL // raisestate }, @@ -28283,7 +28283,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 0, // mass 0, // damage sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOGRAVITY|MF_AMBIENT, // flags + MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOGRAVITY, // flags S_NULL // raisestate }, diff --git a/src/p_mobj.h b/src/p_mobj.h index 429f48812..aee8cda1a 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -122,8 +122,8 @@ typedef enum // Don't apply gravity (every tic); object will float, keeping current height // or changing it actively. MF_NOGRAVITY = 1<<9, - // This object is an ambient sound. Obsolete, but keep this around for backwards compatibility. - MF_AMBIENT = 1<<10, + // Free: + // 1<<10 // Slide this object when it hits a wall. MF_SLIDEME = 1<<11, // Don't collide with walls or solid objects. Two MF_NOCLIP objects can't touch each other at all!