From 4c32b9d4b8d764ab5093da7f61aab78ed722d637 Mon Sep 17 00:00:00 2001 From: danij Date: Sun, 4 Apr 2010 14:38:01 +0100 Subject: [PATCH] Fixed All games: "General: Mobjs overlapping more than one sector". (see here http://sourceforge.net/tracker/?func=detail&aid=2855894&group_id=74815&atid=542099) Revised the fix applied in beta6.6 for the "Bullets not visible in map cheat" issue. Although we now want all mobjs added to the blockmap it is not correct that all mobjs with MF_SOLID are considered so everywhere. This means that we still need the MF_NOBLOCKMAP flag as it defines slightly different behaviour compared to !MF_SOLID. We still ignore the MF_NOBLOCKMAP flag as far as linking goes however it is now checked for in the iteration methods which were previously sensitive to this (namely, PIT_ChangeSector). Ensure you exectute packres.py as the Thing and Flag definitions have changed. --- doomsday/plugins/common/src/p_map.c | 4 + doomsday/plugins/dehread/src/dehmain.c | 6 - doomsday/plugins/jdoom/defs/flags.ded | 6 +- doomsday/plugins/jdoom/defs/objects.ded | 48 +-- doomsday/plugins/jdoom/include/p_mobj.h | 2 +- doomsday/plugins/jdoom64/defs/flags.ded | 6 +- doomsday/plugins/jdoom64/defs/objects.ded | 172 +++++----- doomsday/plugins/jdoom64/include/p_mobj.h | 2 +- doomsday/plugins/jheretic/defs/flags.ded | 6 +- doomsday/plugins/jheretic/defs/objects.ded | 155 ++++----- doomsday/plugins/jheretic/include/p_mobj.h | 2 +- doomsday/plugins/jhexen/defs/flags.ded | 2 +- doomsday/plugins/jhexen/defs/objects.ded | 351 +++++++++++---------- doomsday/plugins/jhexen/include/p_mobj.h | 3 +- doomsday/plugins/jhexen/src/hrefresh.c | 4 +- 15 files changed, 392 insertions(+), 377 deletions(-) diff --git a/doomsday/plugins/common/src/p_map.c b/doomsday/plugins/common/src/p_map.c index 4b0a430546..c3ebfda0e3 100644 --- a/doomsday/plugins/common/src/p_map.c +++ b/doomsday/plugins/common/src/p_map.c @@ -2621,6 +2621,10 @@ void P_SlideMove(mobj_t* mo) boolean PIT_ChangeSector(mobj_t* thing, void* data) { mobj_t* mo; + + // Don't check things that aren't blocklinked (supposedly immaterial). + if(thing->info->flags & MF_NOBLOCKMAP) + return true; if(P_ThingHeightClip(thing)) return true; // Keep checking... diff --git a/doomsday/plugins/dehread/src/dehmain.c b/doomsday/plugins/dehread/src/dehmain.c index 581eb65723..090bfe2eb8 100644 --- a/doomsday/plugins/dehread/src/dehmain.c +++ b/doomsday/plugins/dehread/src/dehmain.c @@ -1406,12 +1406,6 @@ int PatchThing(int thingy) if(vchanged) { - if(value & 0x10) // Old MF_NOBLOCKMAP - { - // Ensure vanilla compatibility; clear incompatible flags. - value &= ~(0x2 /*=MF_SOLID*/| 0x4 /*=MF_SHOOTABLE*/); - } - info->flags[0] = value; if(value & 0x100) // Spawnceiling? diff --git a/doomsday/plugins/jdoom/defs/flags.ded b/doomsday/plugins/jdoom/defs/flags.ded index e78c050a75..3b818e26d6 100644 --- a/doomsday/plugins/jdoom/defs/flags.ded +++ b/doomsday/plugins/jdoom/defs/flags.ded @@ -5,6 +5,7 @@ Flag { ID = "mf_special"; Value = 0x1; } Flag { ID = "mf_solid"; Value = 0x2; } Flag { ID = "mf_shootable"; Value = 0x4; } Flag { ID = "mf_nosector"; Value = 0x8; } +Flag { ID = "mf_noblockmap"; Value = 0x10; } Flag { ID = "mf_ambush"; Value = 0x20; } Flag { ID = "mf_justhit"; Value = 0x40; } Flag { ID = "mf_justattacked"; Value = 0x80; } @@ -55,8 +56,3 @@ Flag { ID = "mf2_dontdraw"; Value = 0x100000; } # Mobj flags3: Flag { ID = "mf3_noinfight"; Value = 0x1; } - -# -# Obsolete (unused) flags: -# -Flag { ID = "mf_noblockmap"; Value = 0; } \ No newline at end of file diff --git a/doomsday/plugins/jdoom/defs/objects.ded b/doomsday/plugins/jdoom/defs/objects.ded index 0363cc6546..cf76f44f0e 100644 --- a/doomsday/plugins/jdoom/defs/objects.ded +++ b/doomsday/plugins/jdoom/defs/objects.ded @@ -135,7 +135,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nogravity | brightshadow; + Flags = noblockmap | nogravity | brightshadow; Flags2 = cannotpush | noteleport; } @@ -190,7 +190,7 @@ Thing { Height = 8; Mass = 100; Damage = 10; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = noteleport; } @@ -215,7 +215,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nogravity; + Flags = noblockmap | nogravity; Flags2 = cannotpush | noteleport; } @@ -270,7 +270,7 @@ Thing { Height = 8; Mass = 100; Damage = 8; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = noteleport; } @@ -465,7 +465,7 @@ Thing { Height = 8; Mass = 100; Damage = 8; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = noteleport; } @@ -738,7 +738,7 @@ Thing { Radius = 20; Height = 32; Mass = 100; - Flags = nosector; + Flags = noblockmap | nosector; } Thing { @@ -762,7 +762,7 @@ Thing { Radius = 20; Height = 32; Mass = 100; - Flags = nosector; + Flags = noblockmap | nosector; } Thing { @@ -788,7 +788,7 @@ Thing { Height = 32; Mass = 100; Damage = 3; - Flags = missile | dropoff | nogravity | noclip; + Flags = noblockmap | missile | dropoff | nogravity | noclip; Flags2 = cannotpush | noteleport; } @@ -813,7 +813,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nogravity; + Flags = noblockmap | nogravity; Flags2 = cannotpush | noteleport; } @@ -865,7 +865,7 @@ Thing { Height = 8; Mass = 100; Damage = 3; - Flags = brightexplode | dropoff | missile | nogravity | brightshadow; + Flags = brightexplode | dropoff | missile | noblockmap | nogravity | brightshadow; Flags2 = noteleport; } @@ -892,7 +892,7 @@ Thing { Height = 8; Mass = 100; Damage = 5; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = noteleport; } @@ -919,7 +919,7 @@ Thing { Height = 8; Mass = 100; Damage = 20; - Flags = missile | dropoff | nogravity | brightexplode; + Flags = noblockmap | missile | dropoff | nogravity | brightexplode; Flags2 = noteleport; } @@ -946,7 +946,7 @@ Thing { Height = 8; Mass = 100; Damage = 5; - Flags = missile | dropoff | nogravity | brightshadow; + Flags = noblockmap | missile | dropoff | nogravity | brightshadow; Flags2 = noteleport; } @@ -973,7 +973,7 @@ Thing { Height = 8; Mass = 100; Damage = 100; - Flags = missile | dropoff | nogravity | brightexplode | brightshadow; + Flags = noblockmap | missile | dropoff | nogravity | brightexplode | brightshadow; Flags2 = noteleport; } @@ -1000,7 +1000,7 @@ Thing { Height = 8; Mass = 100; Damage = 5; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = noteleport; } @@ -1025,7 +1025,7 @@ Thing { Radius = 8; Height = 8; Mass = 100; - Flags = nogravity | viewalign; + Flags = noblockmap | nogravity | viewalign; Flags2 = cannotpush | noteleport; } @@ -1050,7 +1050,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = viewalign; + Flags = noblockmap | viewalign; Flags2 = cannotpush | noteleport; } @@ -1075,7 +1075,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nogravity; + Flags = noblockmap | nogravity; Flags2 = cannotpush | noteleport; } @@ -1100,7 +1100,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nogravity; + Flags = noblockmap | nogravity; Flags2 = cannotpush | noteleport; } @@ -1125,7 +1125,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; Flags2 = cannotpush; } @@ -1150,7 +1150,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nogravity | brightshadow; + Flags = noblockmap | nogravity | brightshadow; Flags2 = cannotpush | noteleport; } @@ -3457,7 +3457,7 @@ Thing { Radius = 16; Height = 16; Mass = 100; - Flags = local | nogravity; + Flags = local | noblockmap | nogravity; } State { @@ -11961,7 +11961,7 @@ Thing { Radius = 1; Height = 1; Mass = 100; - Flags = local | nosector | nogravity; + Flags = local | nosector | noblockmap | nogravity; } State { @@ -12003,7 +12003,7 @@ Thing { Radius = 8; Height = 8; Mass = 100; - Flags = nogravity | viewalign; + Flags = noblockmap | nogravity | viewalign; } State { diff --git a/doomsday/plugins/jdoom/include/p_mobj.h b/doomsday/plugins/jdoom/include/p_mobj.h index 65d40ed268..956b51fb18 100644 --- a/doomsday/plugins/jdoom/include/p_mobj.h +++ b/doomsday/plugins/jdoom/include/p_mobj.h @@ -62,7 +62,7 @@ #define MF_SOLID 0x00000002 // Blocks. #define MF_SHOOTABLE 0x00000004 // Can be hit. #define MF_NOSECTOR 0x00000008 // (p) Don't use the sector links (invisible but touchable). -//#define MF_UNUSED1 0x00000010 // Formerly MF_NOBLOCKMAP +#define MF_NOBLOCKMAP 0x00000010 // (p) Don't use the blocklinks (inert but displayable) #define MF_AMBUSH 0x00000020 // Not to be activated by sound, deaf monster. #define MF_JUSTHIT 0x00000040 // Will try to attack right back. #define MF_JUSTATTACKED 0x00000080 // Will take at least one step before attacking. diff --git a/doomsday/plugins/jdoom64/defs/flags.ded b/doomsday/plugins/jdoom64/defs/flags.ded index 6400a6f932..a7c82be2cf 100644 --- a/doomsday/plugins/jdoom64/defs/flags.ded +++ b/doomsday/plugins/jdoom64/defs/flags.ded @@ -5,6 +5,7 @@ Flag { ID = "mf_special"; Value = 0x1; } Flag { ID = "mf_solid"; Value = 0x2; } Flag { ID = "mf_shootable"; Value = 0x4; } Flag { ID = "mf_nosector"; Value = 0x8; } +Flag { ID = "mf_noblockmap"; Value = 0x10; } Flag { ID = "mf_ambush"; Value = 0x20; } Flag { ID = "mf_justhit"; Value = 0x40; } Flag { ID = "mf_justattacked"; Value = 0x80; } @@ -55,8 +56,3 @@ Flag { ID = "mf2_dontdraw"; Value = 0x100000; } # Mobj flags3: Flag { ID = "mf3_noinfight"; Value = 0x1; } - -# -# Obsolete (unused) flags: -# -Flag { ID = "mf_noblockmap"; Value = 0; } diff --git a/doomsday/plugins/jdoom64/defs/objects.ded b/doomsday/plugins/jdoom64/defs/objects.ded index 5ff3a55f43..3e8ca3b320 100644 --- a/doomsday/plugins/jdoom64/defs/objects.ded +++ b/doomsday/plugins/jdoom64/defs/objects.ded @@ -187,7 +187,7 @@ Thing { Height = 8; Mass = 100; Damage = 10; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = noteleport; } @@ -212,7 +212,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nogravity; + Flags = noblockmap | nogravity; Flags2 = cannotpush | noteleport; } @@ -267,7 +267,7 @@ Thing { Height = 8; Mass = 100; Damage = 8; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = noteleport; } @@ -434,7 +434,7 @@ Thing { Height = 8; Mass = 100; Damage = 8; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = noteleport; } @@ -680,7 +680,7 @@ Thing { Height = 8; Mass = 100; Damage = 3; - Flags = brightexplode | dropoff | missile | nogravity | brightshadow; + Flags = brightexplode | dropoff | missile | noblockmap | nogravity | brightshadow; Flags2 = noteleport; } @@ -707,7 +707,7 @@ Thing { Height = 8; Mass = 100; Damage = 10; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = noteleport; } @@ -734,7 +734,7 @@ Thing { Height = 8; Mass = 100; Damage = 20; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = noteleport; } @@ -761,7 +761,7 @@ Thing { Height = 8; Mass = 100; Damage = 20; - Flags = missile | dropoff | nogravity; + Flags = missile | noblockmap | dropoff | nogravity; Flags2 = noteleport; } @@ -788,7 +788,7 @@ Thing { Height = 8; Mass = 100; Damage = 7; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = noteleport; } @@ -815,7 +815,7 @@ Thing { Height = 8; Mass = 100; Damage = 100; - Flags = missile | dropoff | nogravity | brightexplode | brightshadow; + Flags = noblockmap | missile | dropoff | nogravity | brightexplode | brightshadow; Flags2 = noteleport; } @@ -842,7 +842,7 @@ Thing { Height = 8; Mass = 100; Damage = 5; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = noteleport; } @@ -867,7 +867,7 @@ Thing { Radius = 8; Height = 8; Mass = 100; - Flags = nogravity | viewalign; + Flags = noblockmap | nogravity | viewalign; Flags2 = cannotpush | noteleport; } @@ -892,7 +892,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = viewalign; + Flags = noblockmap | viewalign; Flags2 = cannotpush | noteleport; } @@ -917,7 +917,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nogravity | brightshadow; + Flags = noblockmap | nogravity | brightshadow; Flags2 = cannotpush | noteleport; } @@ -942,7 +942,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nogravity; + Flags = noblockmap | nogravity; Flags2 = cannotpush | noteleport; } @@ -967,7 +967,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; Flags2 = cannotpush; } @@ -992,7 +992,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nogravity | brightshadow; + Flags = noblockmap | nogravity | brightshadow; Flags2 = cannotpush | noteleport; } @@ -2954,6 +2954,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = noblockmap; } Thing { @@ -2977,6 +2978,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = noblockmap; } Thing { @@ -3027,7 +3029,7 @@ Thing { Height = 8; Mass = 100; Damage = 8; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = cannotpush | noteleport; } @@ -3054,7 +3056,7 @@ Thing { Height = 8; Mass = 100; Damage = 3; - Flags = brightexplode | dropoff | missile | nogravity | brightshadow; + Flags = brightexplode | dropoff | missile | noblockmap | nogravity | brightshadow; Flags2 = cannotpush | noteleport; } @@ -3079,7 +3081,7 @@ Thing { Radius = 8; Height = 8; Mass = 100; - Flags = nogravity; + Flags = noblockmap | nogravity; Flags2 = cannotpush | noteleport; } @@ -3130,7 +3132,7 @@ Thing { Height = 8; Mass = 100; Damage = 10; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = cannotpush | noteleport; } @@ -3157,7 +3159,7 @@ Thing { Height = 8; Mass = 100; Damage = 0; - Flags = nogravity; + Flags = noblockmap | nogravity; Flags2 = cannotpush | noteleport; } @@ -3256,7 +3258,7 @@ Thing { Height = 8; Mass = 100; Damage = 5; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = cannotpush | noteleport; } @@ -3310,7 +3312,7 @@ Thing { Height = 8; Mass = 100; Damage = 10; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = passmobj | cannotpush | noteleport; } @@ -3335,7 +3337,7 @@ Thing { Radius = 8; Height = 8; Mass = 100; - Flags = nogravity; + Flags = noblockmap | nogravity; Flags2 = cannotpush | noteleport; } @@ -3362,7 +3364,7 @@ Thing { Height = 8; Mass = 100; Damage = 4; - Flags = missile | dropoff | nogravity; + Flags = noblockmap | missile | dropoff | nogravity; Flags2 = passmobj | cannotpush; } @@ -3387,7 +3389,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3411,7 +3413,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3435,7 +3437,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3459,7 +3461,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3483,7 +3485,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3507,7 +3509,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3531,7 +3533,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3555,7 +3557,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3579,7 +3581,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3603,7 +3605,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3627,7 +3629,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3651,7 +3653,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3675,7 +3677,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3699,7 +3701,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3723,7 +3725,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3747,7 +3749,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3771,7 +3773,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3795,7 +3797,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3819,7 +3821,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3843,7 +3845,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3867,7 +3869,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3891,7 +3893,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3915,7 +3917,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3939,7 +3941,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3963,7 +3965,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -3987,7 +3989,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4011,7 +4013,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4035,7 +4037,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4059,7 +4061,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4083,7 +4085,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4107,7 +4109,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4131,7 +4133,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4155,7 +4157,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4179,7 +4181,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4203,7 +4205,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4227,7 +4229,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4251,7 +4253,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4275,7 +4277,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4299,7 +4301,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4323,7 +4325,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4347,7 +4349,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4371,7 +4373,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4395,7 +4397,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4419,7 +4421,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4443,7 +4445,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4467,7 +4469,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4491,7 +4493,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4515,7 +4517,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4539,7 +4541,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4563,7 +4565,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4587,7 +4589,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4611,7 +4613,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4635,7 +4637,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4659,7 +4661,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4683,7 +4685,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4707,7 +4709,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = nosector | local; + Flags = noblockmap | nosector | local; } Thing { @@ -4760,7 +4762,7 @@ Thing { Height = 8; Mass = 100; Damage = 20; - Flags = dropoff | nogravity | brightexplode | float | noclip; + Flags = noblockmap | dropoff | nogravity | brightexplode | float | noclip; } Thing { @@ -4782,7 +4784,7 @@ Thing { Radius = 16; Height = 16; Mass = 100; - Flags = local | nogravity; + Flags = local | noblockmap | nogravity; } Thing { @@ -4804,7 +4806,7 @@ Thing { Radius = 1; Height = 1; Mass = 100; - Flags = local | nosector | nogravity; + Flags = local | nosector | noblockmap | nogravity; } Thing { diff --git a/doomsday/plugins/jdoom64/include/p_mobj.h b/doomsday/plugins/jdoom64/include/p_mobj.h index 2e9d4537c9..cdd9d3caab 100644 --- a/doomsday/plugins/jdoom64/include/p_mobj.h +++ b/doomsday/plugins/jdoom64/include/p_mobj.h @@ -151,7 +151,7 @@ #define MF_SOLID 0x00000002 // Blocks. #define MF_SHOOTABLE 0x00000004 // Can be hit. #define MF_NOSECTOR 0x00000008 // (p) Don't use the sector links (invisible but touchable). -//#define MF_UNUSED1 0x00000010 // Formerly MF_NOBLOCKMAP +#define MF_NOBLOCKMAP 0x00000010 // (p) Don't use the blocklinks (inert but displayable) #define MF_AMBUSH 0x00000020 // Not to be activated by sound, deaf monster. #define MF_JUSTHIT 0x00000040 // Will try to attack right back. #define MF_JUSTATTACKED 0x00000080 // Will take at least one step before attacking. diff --git a/doomsday/plugins/jheretic/defs/flags.ded b/doomsday/plugins/jheretic/defs/flags.ded index 0199f8d46b..ccd7804bd0 100644 --- a/doomsday/plugins/jheretic/defs/flags.ded +++ b/doomsday/plugins/jheretic/defs/flags.ded @@ -5,6 +5,7 @@ Flag { ID = "mf_special"; Value = 0x1; } Flag { ID = "mf_solid"; Value = 0x2; } Flag { ID = "mf_shootable"; Value = 0x4; } Flag { ID = "mf_nosector"; Value = 0x8; } +Flag { ID = "mf_noblockmap"; Value = 0x10; } Flag { ID = "mf_ambush"; Value = 0x20; } Flag { ID = "mf_justhit"; Value = 0x40; } Flag { ID = "mf_justattacked"; Value = 0x80; } @@ -57,8 +58,3 @@ Flag { ID = "mf2_dontdraw"; Value = 0x100000; } # Mobj flags3: Flag { ID = "mf3_noinfight"; Value = 0x1; } - -# -# Obsolete (unused) flags: -# -Flag { ID = "mf_noblockmap"; Value = 0; } diff --git a/doomsday/plugins/jheretic/defs/objects.ded b/doomsday/plugins/jheretic/defs/objects.ded index 54e2415202..912337226c 100644 --- a/doomsday/plugins/jheretic/defs/objects.ded +++ b/doomsday/plugins/jheretic/defs/objects.ded @@ -304,7 +304,7 @@ Thing { Height = 8; Mass = 100; Damage = 1; - Flags = "mf_missile mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport"; } @@ -479,7 +479,7 @@ Thing { Radius = 2; Height = 4; Mass = 100; - Flags = "mf_missile mf_dropoff"; + Flags = "mf_noblockmap mf_missile mf_dropoff"; Flags2 = "mf2_noteleport mf2_lograv mf2_cannotpush"; } @@ -504,7 +504,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nosector"; + Flags = "mf_noblockmap mf_nosector"; } Thing { @@ -528,7 +528,7 @@ Thing { Radius = 2; Height = 4; Mass = 100; - Flags = "mf_missile mf_dropoff"; + Flags = "mf_noblockmap mf_missile mf_dropoff"; Flags2 = "mf2_noteleport mf2_lograv mf2_cannotpush"; } @@ -553,6 +553,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -576,6 +577,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -599,7 +601,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_shadow"; + Flags = "mf_noblockmap mf_nogravity mf_shadow"; } Thing { @@ -623,7 +625,7 @@ Thing { Radius = 2; Height = 4; Mass = 100; - Flags = "mf_missile mf_dropoff"; + Flags = "mf_noblockmap mf_missile mf_dropoff"; Flags2 = "mf2_noteleport mf2_lograv mf2_cannotpush"; } @@ -648,6 +650,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -1225,7 +1228,7 @@ Thing { Height = 8; Mass = 100; Damage = 2; - Flags = "mf_missile mf_dropoff"; + Flags = "mf_noblockmap mf_missile mf_dropoff"; Flags2 = "mf2_lograv mf2_noteleport mf2_firedamage"; } @@ -1252,7 +1255,7 @@ Thing { Height = 6; Mass = 100; Damage = 1; - Flags = "mf_missile mf_dropoff"; + Flags = "mf_noblockmap mf_missile mf_dropoff"; Flags2 = "mf2_lograv mf2_noteleport mf2_firedamage"; } @@ -1277,7 +1280,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_nosector mf_local"; + Flags = "mf_noblockmap mf_nogravity mf_nosector mf_local"; } Thing { @@ -1301,7 +1304,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_nosector mf_local"; + Flags = "mf_noblockmap mf_nogravity mf_nosector mf_local"; } Thing { @@ -1325,7 +1328,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_missile mf_brightshadow mf_local"; + Flags = "mf_noblockmap mf_nogravity mf_missile mf_brightshadow mf_local"; Flags2 = "mf2_noteleport"; } @@ -1350,7 +1353,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_missile mf_brightshadow mf_local"; + Flags = "mf_noblockmap mf_nogravity mf_missile mf_brightshadow mf_local"; Flags2 = "mf2_noteleport"; } @@ -1375,7 +1378,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -1399,7 +1402,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nosector"; + Flags = "mf_noblockmap mf_nosector"; } Thing { @@ -1423,7 +1426,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -1447,7 +1450,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -1471,7 +1474,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -1519,7 +1522,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_brightshadow"; + Flags = "mf_noblockmap mf_nogravity mf_brightshadow"; } Thing { @@ -1543,7 +1546,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_brightshadow"; + Flags = "mf_noblockmap mf_nogravity mf_brightshadow"; } Thing { @@ -1593,7 +1596,7 @@ Thing { Height = 8; Mass = 100; Damage = 2; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -1618,7 +1621,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_shadow mf_viewalign"; + Flags = "mf_noblockmap mf_nogravity mf_shadow mf_viewalign"; Flags2 = "mf2_noteleport mf2_cannotpush"; } @@ -1645,7 +1648,7 @@ Thing { Height = 6; Mass = 100; Damage = 1; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport mf2_rip"; } @@ -1670,7 +1673,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_brightshadow"; + Flags = "mf_noblockmap mf_nogravity mf_brightshadow"; } Thing { @@ -1694,7 +1697,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_brightshadow"; + Flags = "mf_noblockmap mf_nogravity mf_brightshadow"; } Thing { @@ -1744,7 +1747,7 @@ Thing { Height = 6; Mass = 100; Damage = 2; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_floorbounce mf2_thrughost mf2_noteleport"; } @@ -1771,7 +1774,7 @@ Thing { Height = 6; Mass = 100; Damage = 6; - Flags = "mf_missile mf_dropoff mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_brightexplode"; Flags2 = "mf2_lograv mf2_floorbounce mf2_thrughost mf2_noteleport"; } @@ -1798,7 +1801,7 @@ Thing { Height = 6; Mass = 100; Damage = 4; - Flags = "mf_missile mf_dropoff mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_brightexplode"; Flags2 = "mf2_lograv mf2_floorbounce mf2_thrughost mf2_noteleport"; } @@ -1825,7 +1828,7 @@ Thing { Height = 6; Mass = 100; Damage = 18; - Flags = "mf_missile mf_dropoff mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_brightexplode"; Flags2 = "mf2_lograv mf2_floorbounce mf2_thrughost mf2_noteleport"; } @@ -1876,7 +1879,7 @@ Thing { Height = 8; Mass = 100; Damage = 3; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_windthrust mf2_noteleport"; } @@ -1903,7 +1906,7 @@ Thing { Height = 8; Mass = 100; Damage = 10; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -1930,7 +1933,7 @@ Thing { Height = 12; Mass = 100; Damage = 5; - Flags = "mf_missile mf_dropoff mf_nogravity mf_viewalign mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_viewalign mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -1957,7 +1960,7 @@ Thing { Height = 12; Mass = 100; Damage = 5; - Flags = "mf_missile mf_dropoff mf_nogravity mf_viewalign mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_viewalign mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -1984,7 +1987,7 @@ Thing { Height = 12; Mass = 100; Damage = 5; - Flags = "mf_missile mf_dropoff mf_nogravity mf_viewalign mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_viewalign mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -2011,7 +2014,7 @@ Thing { Height = 12; Mass = 100; Damage = 5; - Flags = "mf_missile mf_dropoff mf_nogravity mf_viewalign mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_viewalign mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -2038,7 +2041,7 @@ Thing { Height = 6; Mass = 100; Damage = 2; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -2065,7 +2068,7 @@ Thing { Height = 6; Mass = 100; Damage = 1; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -2090,7 +2093,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_brightshadow"; + Flags = "mf_noblockmap mf_nogravity mf_brightshadow"; } Thing { @@ -2114,7 +2117,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_brightshadow"; + Flags = "mf_noblockmap mf_nogravity mf_brightshadow"; } Thing { @@ -2164,7 +2167,7 @@ Thing { Height = 8; Mass = 100; Damage = 20; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_thrughost mf2_noteleport"; } @@ -2189,7 +2192,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_shadow mf_viewalign"; + Flags = "mf_noblockmap mf_nogravity mf_shadow mf_viewalign"; Flags2 = "mf2_noteleport mf2_cannotpush"; } @@ -2216,7 +2219,7 @@ Thing { Height = 8; Mass = 100; Damage = 2; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightshadow"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightshadow"; Flags2 = "mf2_noteleport mf2_firedamage"; } @@ -2267,7 +2270,7 @@ Thing { Height = 8; Mass = 100; Damage = 10; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -2294,7 +2297,7 @@ Thing { Height = 8; Mass = 100; Damage = 6; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -2321,7 +2324,7 @@ Thing { Height = 8; Mass = 100; Damage = 2; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_windthrust mf2_thrughost mf2_noteleport"; } @@ -2346,7 +2349,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_brightshadow mf_local"; + Flags = "mf_noblockmap mf_brightshadow mf_local"; Flags2 = "mf2_lograv"; } @@ -2371,6 +2374,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -2394,7 +2398,7 @@ Thing { Radius = 2; Height = 4; Mass = 100; - Flags = "mf_missile mf_dropoff"; + Flags = "mf_noblockmap mf_missile mf_dropoff"; Flags2 = "mf2_noteleport mf2_cannotpush"; } @@ -2444,7 +2448,7 @@ Thing { Radius = 4; Height = 4; Mass = 100; - Flags = "mf_dropoff"; + Flags = "mf_noblockmap mf_dropoff"; Flags2 = "mf2_lograv mf2_cannotpush"; } @@ -2521,7 +2525,7 @@ Thing { Radius = 2; Height = 4; Mass = 100; - Flags = "mf_missile mf_dropoff"; + Flags = "mf_noblockmap mf_missile mf_dropoff"; Flags2 = "mf2_noteleport mf2_lograv mf2_cannotpush mf2_windthrust"; } @@ -2654,7 +2658,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -2680,7 +2684,7 @@ Thing { Height = 14; Mass = 100; Damage = 4; - Flags = "mf_missile mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport"; } @@ -2734,7 +2738,7 @@ Thing { Height = 8; Mass = 100; Damage = 4; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_windthrust mf2_noteleport"; } @@ -2761,7 +2765,7 @@ Thing { Height = 8; Mass = 100; Damage = 2; - Flags = "mf_nogravity mf_missile"; + Flags = "mf_noblockmap mf_nogravity mf_missile"; Flags2 = "mf2_noteleport"; } @@ -2788,7 +2792,7 @@ Thing { Height = 8; Mass = 100; Damage = 2; - Flags = "mf_nogravity mf_missile"; + Flags = "mf_noblockmap mf_nogravity mf_missile"; Flags2 = "mf2_noteleport"; } @@ -2815,7 +2819,7 @@ Thing { Height = 8; Mass = 100; Damage = 2; - Flags = "mf_nogravity mf_missile"; + Flags = "mf_noblockmap mf_nogravity mf_missile"; Flags2 = "mf2_noteleport"; } @@ -2869,7 +2873,7 @@ Thing { Height = 8; Mass = 100; Damage = 1; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_windthrust mf2_noteleport"; } @@ -2896,7 +2900,7 @@ Thing { Height = 8; Mass = 100; Damage = 3; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -2950,7 +2954,7 @@ Thing { Height = 6; Mass = 100; Damage = 1; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport mf2_thrughost"; } @@ -2977,7 +2981,7 @@ Thing { Height = 6; Mass = 100; Damage = 3; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -3004,7 +3008,7 @@ Thing { Height = 12; Mass = 100; Damage = 5; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightshadow mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightshadow mf_brightexplode"; Flags2 = "mf2_windthrust mf2_noteleport"; } @@ -3031,7 +3035,7 @@ Thing { Height = 74; Mass = 100; Damage = 1; - Flags = "mf_missile mf_dropoff mf_nogravity mf_shadow"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_shadow"; Flags2 = "mf2_noteleport"; } @@ -3112,7 +3116,7 @@ Thing { Height = 6; Mass = 100; Damage = 3; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -3191,6 +3195,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -3214,6 +3219,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -3239,7 +3245,7 @@ Thing { Height = 8; Mass = 100; Damage = 1; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_windthrust mf2_noteleport"; } @@ -3320,7 +3326,7 @@ Thing { Height = 8; Mass = 100; Damage = 2; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_windthrust mf2_noteleport mf2_thrughost"; } @@ -3347,7 +3353,7 @@ Thing { Height = 8; Mass = 100; Damage = 7; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport mf2_thrughost"; } @@ -3402,7 +3408,7 @@ Thing { Height = 10; Mass = 100; Damage = 10; - Flags = "mf_missile mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_firedamage"; } @@ -3457,7 +3463,7 @@ Thing { Height = 6; Mass = 100; Damage = 1; - Flags = "mf_missile mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport"; } @@ -3482,7 +3488,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; Flags2 = "mf2_noteleport mf2_cannotpush"; } @@ -3509,7 +3515,7 @@ Thing { Height = 6; Mass = 100; Damage = 10; - Flags = "mf_missile mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport"; } @@ -3534,6 +3540,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -3588,7 +3595,7 @@ Thing { Height = 6; Mass = 100; Damage = 3; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport mf2_firedamage"; } @@ -3615,7 +3622,7 @@ Thing { Height = 12; Mass = 100; Damage = 4; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport mf2_firedamage"; } @@ -3641,7 +3648,7 @@ Thing { Height = 16; Mass = 100; Damage = 4; - Flags = "mf_missile mf_dropoff mf_nogravity mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity mf_brightexplode"; Flags2 = "mf2_noteleport mf2_firedamage"; } @@ -4026,7 +4033,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nosector mf_local"; + Flags = "mf_noblockmap mf_nosector mf_local"; } Thing { @@ -4050,7 +4057,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nosector mf_local"; + Flags = "mf_noblockmap mf_nosector mf_local"; } State { @@ -14105,7 +14112,7 @@ Thing { Radius = 1; Height = 1; Mass = 100; - Flags = "mf_local mf_nosector mf_nogravity"; + Flags = "mf_local mf_nosector mf_noblockmap mf_nogravity"; Flags2 = "mf2_dontdraw"; } diff --git a/doomsday/plugins/jheretic/include/p_mobj.h b/doomsday/plugins/jheretic/include/p_mobj.h index 16960422ea..f8ad88856a 100644 --- a/doomsday/plugins/jheretic/include/p_mobj.h +++ b/doomsday/plugins/jheretic/include/p_mobj.h @@ -60,7 +60,7 @@ #define MF_SOLID 0x00000002 // Blocks. #define MF_SHOOTABLE 0x00000004 // Can be hit. #define MF_NOSECTOR 0x00000008 // (p) Don't use the sector links (invisible but touchable). -//#define MF_UNUSED1 0x00000010 // Formerly MF_NOBLOCKMAP +#define MF_NOBLOCKMAP 0x00000010 // (p) Don't use the blocklinks (inert but displayable) #define MF_AMBUSH 0x00000020 // Not to be activated by sound, deaf monster. #define MF_JUSTHIT 0x00000040 // Will try to attack right back. #define MF_JUSTATTACKED 0x00000080 // Will take at least one step before attacking. diff --git a/doomsday/plugins/jhexen/defs/flags.ded b/doomsday/plugins/jhexen/defs/flags.ded index 46054b9a50..a2e91ba91e 100644 --- a/doomsday/plugins/jhexen/defs/flags.ded +++ b/doomsday/plugins/jhexen/defs/flags.ded @@ -5,6 +5,7 @@ Flag { ID = "mf_special"; Value = 0x1; } Flag { ID = "mf_solid"; Value = 0x2; } Flag { ID = "mf_shootable"; Value = 0x4; } Flag { ID = "mf_nosector"; Value = 0x8; } +Flag { ID = "mf_noblockmap"; Value = 0x10; } Flag { ID = "mf_ambush"; Value = 0x20; } Flag { ID = "mf_justhit"; Value = 0x40; } Flag { ID = "mf_justattacked"; Value = 0x80; } @@ -72,5 +73,4 @@ Flag { ID = "mf3_noinfight"; Value = 0x1; } # # Obsolete (unused) flags: # -Flag { ID = "mf_noblockmap"; Value = 0; } Flag { ID = "mf2_onmobj"; Value = 0; } diff --git a/doomsday/plugins/jhexen/defs/objects.ded b/doomsday/plugins/jhexen/defs/objects.ded index 968d8b01c2..807556b3a5 100644 --- a/doomsday/plugins/jhexen/defs/objects.ded +++ b/doomsday/plugins/jhexen/defs/objects.ded @@ -26,7 +26,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nosector mf_nogravity"; + Flags = "mf_noblockmap mf_nosector mf_nogravity"; Flags2 = "mf2_dontdraw"; } @@ -77,7 +77,7 @@ Thing { Height = 8; Mass = 100; Damage = 4; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_firedamage"; } @@ -104,7 +104,7 @@ Thing { Height = 4; Mass = 100; Damage = 4; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport"; } @@ -131,7 +131,7 @@ Thing { Height = 4; Mass = 100; Damage = 2; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport"; } @@ -158,7 +158,7 @@ Thing { Height = 4; Mass = 100; Damage = 2; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport"; } @@ -185,7 +185,7 @@ Thing { Height = 16; Mass = 100; Damage = 2; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_rip"; } @@ -212,7 +212,7 @@ Thing { Height = 6; Mass = 100; Damage = 3; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport"; } @@ -239,7 +239,7 @@ Thing { Height = 8; Mass = 100; Damage = 1; - Flags = "mf_missile mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_icedamage"; } @@ -486,7 +486,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_missile mf_dropoff"; + Flags = "mf_missile mf_dropoff mf_noblockmap"; Flags2 = "mf2_noteleport"; } @@ -587,7 +587,7 @@ Thing { Height = 16; Mass = 100; Damage = 10001; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity mf_noblockmap"; Flags2 = "mf2_noteleport"; } @@ -614,7 +614,7 @@ Thing { Height = 16; Mass = 100; Damage = 10001; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity mf_noblockmap"; Flags2 = "mf2_noteleport"; } @@ -641,7 +641,7 @@ Thing { Height = 16; Mass = 100; Damage = 10001; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity mf_noblockmap"; Flags2 = "mf2_noteleport"; } @@ -668,7 +668,7 @@ Thing { Height = 16; Mass = 100; Damage = 10001; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity mf_noblockmap"; Flags2 = "mf2_noteleport"; } @@ -695,7 +695,7 @@ Thing { Height = 16; Mass = 100; Damage = 10001; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity mf_noblockmap"; Flags2 = "mf2_noteleport"; } @@ -720,7 +720,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport"; } @@ -745,7 +745,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport"; } @@ -770,7 +770,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport"; } @@ -795,7 +795,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport mf2_lograv"; } @@ -820,7 +820,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport mf2_lograv"; } @@ -845,7 +845,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport mf2_lograv"; } @@ -870,6 +870,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; Flags2 = "mf2_noteleport"; } @@ -894,7 +895,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport"; } @@ -919,7 +920,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport"; } @@ -944,7 +945,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport"; } @@ -969,7 +970,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nosector"; + Flags = "mf_noblockmap mf_nosector"; Flags2 = "mf2_dontdraw mf2_floatbob"; } @@ -995,7 +996,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_float mf_nogravity mf_shadow mf_noclip"; + Flags = "mf_noblockmap mf_float mf_nogravity mf_shadow mf_noclip"; Flags2 = "mf2_noteleport"; } @@ -1021,7 +1022,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_float mf_nogravity mf_shadow mf_noclip"; + Flags = "mf_noblockmap mf_float mf_nogravity mf_shadow mf_noclip"; Flags2 = "mf2_noteleport"; } @@ -1047,7 +1048,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_float mf_nogravity mf_shadow mf_noclip"; + Flags = "mf_noblockmap mf_float mf_nogravity mf_shadow mf_noclip"; Flags2 = "mf2_noteleport"; } @@ -1072,7 +1073,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nosector"; + Flags = "mf_noblockmap mf_nosector"; Flags2 = "mf2_dontdraw"; } @@ -1097,7 +1098,7 @@ Thing { Radius = 5; Height = 16; Mass = 5; - Flags = "mf_dropoff mf_missile mf_nogravity"; + Flags = "mf_noblockmap mf_dropoff mf_missile mf_nogravity"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -1122,7 +1123,7 @@ Thing { Radius = 5; Height = 16; Mass = 5; - Flags = "mf_dropoff mf_missile mf_nogravity"; + Flags = "mf_noblockmap mf_dropoff mf_missile mf_nogravity"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -1147,7 +1148,7 @@ Thing { Radius = 5; Height = 16; Mass = 5; - Flags = "mf_dropoff mf_missile mf_nogravity"; + Flags = "mf_noblockmap mf_dropoff mf_missile mf_nogravity"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -1172,7 +1173,7 @@ Thing { Radius = 5; Height = 16; Mass = 5; - Flags = "mf_dropoff mf_missile mf_nogravity"; + Flags = "mf_noblockmap mf_dropoff mf_missile mf_nogravity"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -1197,7 +1198,7 @@ Thing { Radius = 5; Height = 16; Mass = 5; - Flags = "mf_dropoff mf_missile mf_nogravity"; + Flags = "mf_noblockmap mf_dropoff mf_missile mf_nogravity"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -1222,7 +1223,7 @@ Thing { Radius = 5; Height = 16; Mass = 5; - Flags = "mf_dropoff mf_missile mf_nogravity"; + Flags = "mf_noblockmap mf_dropoff mf_missile mf_nogravity"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -1247,7 +1248,7 @@ Thing { Radius = 5; Height = 16; Mass = 5; - Flags = "mf_dropoff mf_missile mf_nogravity"; + Flags = "mf_noblockmap mf_dropoff mf_missile mf_nogravity"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -1272,7 +1273,7 @@ Thing { Radius = 5; Height = 16; Mass = 5; - Flags = "mf_dropoff mf_missile mf_nogravity"; + Flags = "mf_noblockmap mf_dropoff mf_missile mf_nogravity"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -1297,7 +1298,7 @@ Thing { Radius = 5; Height = 16; Mass = 5; - Flags = "mf_dropoff mf_missile mf_nogravity"; + Flags = "mf_noblockmap mf_dropoff mf_missile mf_nogravity"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -1322,7 +1323,7 @@ Thing { Radius = 5; Height = 16; Mass = 5; - Flags = "mf_dropoff mf_missile mf_nogravity"; + Flags = "mf_noblockmap mf_dropoff mf_missile mf_nogravity"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -1374,7 +1375,7 @@ Thing { Height = 8; Mass = 100; Damage = 1; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport"; } @@ -1980,7 +1981,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_nogravity mf_noblockmap"; } Thing { @@ -2004,7 +2005,7 @@ Thing { Radius = 1; Height = 1; Mass = 2147483647; - Flags = "mf_nogravity mf_shadow mf_noclip mf_dropoff mf_viewalign"; + Flags = "mf_nogravity mf_noblockmap mf_shadow mf_noclip mf_dropoff mf_viewalign"; Flags2 = "mf2_nodmgthrust"; } @@ -2030,7 +2031,7 @@ Thing { Radius = 8; Height = 10; Mass = 100; - Flags = "mf_dropoff mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_dropoff mf_missile mf_brightexplode"; Flags2 = "mf2_floorbounce mf2_firedamage"; } @@ -2180,7 +2181,7 @@ Thing { Radius = 2; Height = 4; Mass = 100; - Flags = "mf_missile mf_dropoff"; + Flags = "mf_noblockmap mf_missile mf_dropoff"; Flags2 = "mf2_noteleport mf2_lograv mf2_cannotpush"; } @@ -2205,6 +2206,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -2228,6 +2230,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -2251,7 +2254,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_shadow"; + Flags = "mf_noblockmap mf_nogravity mf_shadow"; } Thing { @@ -2275,7 +2278,7 @@ Thing { Radius = 2; Height = 4; Mass = 100; - Flags = "mf_missile mf_dropoff"; + Flags = "mf_noblockmap mf_missile mf_dropoff"; Flags2 = "mf2_noteleport mf2_lograv mf2_cannotpush"; } @@ -2300,6 +2303,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -4350,6 +4354,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; + Flags = "mf_noblockmap"; Flags2 = "mf2_telestomp"; } @@ -4399,6 +4404,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -4422,7 +4428,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -4446,7 +4452,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nosector mf_local"; + Flags = "mf_noblockmap mf_nosector mf_local"; Flags2 = "mf2_dontdraw"; } @@ -4471,7 +4477,7 @@ Thing { Radius = 2; Height = 4; Mass = 100; - Flags = "mf_missile mf_local"; + Flags = "mf_noblockmap mf_missile mf_local"; Flags2 = "mf2_noteleport mf2_lograv"; } @@ -4496,7 +4502,7 @@ Thing { Radius = 2; Height = 4; Mass = 100; - Flags = "mf_missile mf_local"; + Flags = "mf_noblockmap mf_missile mf_local"; Flags2 = "mf2_noteleport mf2_lograv"; } @@ -4594,7 +4600,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_viewalign"; + Flags = "mf_noblockmap mf_nogravity mf_viewalign"; Flags2 = "mf2_noteleport"; } @@ -4619,7 +4625,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -4643,7 +4649,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -4955,6 +4961,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -5074,7 +5081,7 @@ Thing { Radius = 4; Height = 32; Mass = 100; - Flags = "mf_nogravity mf_spawnceiling"; + Flags = "mf_noblockmap mf_nogravity mf_spawnceiling"; } Thing { @@ -5098,7 +5105,7 @@ Thing { Radius = 4; Height = 64; Mass = 100; - Flags = "mf_nogravity mf_spawnceiling"; + Flags = "mf_noblockmap mf_nogravity mf_spawnceiling"; } Thing { @@ -5122,7 +5129,7 @@ Thing { Radius = 4; Height = 32; Mass = 100; - Flags = "mf_nogravity mf_spawnceiling"; + Flags = "mf_noblockmap mf_nogravity mf_spawnceiling"; } Thing { @@ -5146,7 +5153,7 @@ Thing { Radius = 4; Height = 32; Mass = 100; - Flags = "mf_nogravity mf_spawnceiling"; + Flags = "mf_noblockmap mf_nogravity mf_spawnceiling"; } Thing { @@ -5170,7 +5177,7 @@ Thing { Radius = 4; Height = 32; Mass = 100; - Flags = "mf_nogravity mf_spawnceiling"; + Flags = "mf_noblockmap mf_nogravity mf_spawnceiling"; } Thing { @@ -5194,7 +5201,7 @@ Thing { Radius = 4; Height = 32; Mass = 100; - Flags = "mf_nogravity mf_spawnceiling"; + Flags = "mf_noblockmap mf_nogravity mf_spawnceiling"; } Thing { @@ -5218,7 +5225,7 @@ Thing { Radius = 4; Height = 32; Mass = 100; - Flags = "mf_nogravity mf_spawnceiling"; + Flags = "mf_noblockmap mf_nogravity mf_spawnceiling"; } Thing { @@ -5242,6 +5249,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -5265,6 +5273,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -5288,6 +5297,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -5311,6 +5321,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -5334,6 +5345,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -5357,6 +5369,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -5380,6 +5393,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -5403,6 +5417,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -5426,6 +5441,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -5449,6 +5465,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; + Flags = "mf_noblockmap"; } Thing { @@ -5472,7 +5489,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -5496,7 +5513,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -5520,7 +5537,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nosector"; + Flags = "mf_noblockmap mf_nosector"; Flags2 = "mf2_dontdraw"; } @@ -5545,7 +5562,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_viewalign mf_nogravity mf_shadow"; + Flags = "mf_noblockmap mf_viewalign mf_nogravity mf_shadow"; } Thing { @@ -5593,7 +5610,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_shadow"; + Flags = "mf_noblockmap mf_nogravity mf_shadow"; } Thing { @@ -5617,7 +5634,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -5641,7 +5658,7 @@ Thing { Radius = 2; Height = 4; Mass = 100; - Flags = "mf_nogravity mf_dropoff"; + Flags = "mf_noblockmap mf_nogravity mf_dropoff"; Flags2 = "mf2_noteleport mf2_cannotpush"; } @@ -5692,7 +5709,7 @@ Thing { Height = 20; Mass = 100; Damage = 10; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_impact mf2_pcross mf2_firedamage"; } @@ -5717,7 +5734,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_shadow"; + Flags = "mf_noblockmap mf_nogravity mf_shadow"; } Thing { @@ -5743,7 +5760,7 @@ Thing { Height = 8; Mass = 100; Damage = 8; - Flags = "mf_missile mf_brightexplode mf_nogravity mf_dropoff"; + Flags = "mf_missile mf_brightexplode mf_noblockmap mf_nogravity mf_dropoff"; Flags2 = "mf2_noteleport mf2_impact mf2_pcross"; } @@ -5768,7 +5785,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_viewalign mf_shadow"; + Flags = "mf_noblockmap mf_nogravity mf_viewalign mf_shadow"; } Thing { @@ -5818,7 +5835,7 @@ Thing { Height = 10; Mass = 100; Damage = 5; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_impact mf2_pcross"; } @@ -5843,7 +5860,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_shadow"; + Flags = "mf_noblockmap mf_nogravity mf_shadow"; } Thing { @@ -5891,7 +5908,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_viewalign mf_nogravity"; + Flags = "mf_noblockmap mf_viewalign mf_nogravity"; } Thing { @@ -5915,7 +5932,7 @@ Thing { Radius = 1; Height = 1; Mass = 100; - Flags = "mf_viewalign mf_nogravity mf_brightshadow"; + Flags = "mf_noblockmap mf_viewalign mf_nogravity mf_brightshadow"; } Thing { @@ -5939,7 +5956,7 @@ Thing { Radius = 1; Height = 1; Mass = 100; - Flags = "mf_viewalign mf_nogravity mf_brightshadow"; + Flags = "mf_noblockmap mf_viewalign mf_nogravity mf_brightshadow"; } Thing { @@ -5964,7 +5981,7 @@ Thing { Height = 16; Mass = 100; Damage = 2; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity mf_brightshadow"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity mf_brightshadow"; Flags2 = "mf2_noteleport mf2_firedamage"; } @@ -5991,7 +6008,7 @@ Thing { Height = 8; Mass = 100; Damage = 8; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity mf_brightshadow"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity mf_brightshadow"; Flags2 = "mf2_noteleport mf2_impact mf2_pcross mf2_dontdraw mf2_firedamage"; } @@ -6018,7 +6035,7 @@ Thing { Height = 6; Mass = 100; Damage = 3; - Flags = "mf_dropoff mf_nogravity mf_brightshadow mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_dropoff mf_nogravity mf_brightshadow mf_missile mf_brightexplode"; Flags2 = "mf2_noteleport mf2_seekermissile mf2_rip mf2_impact mf2_pcross"; } @@ -6043,7 +6060,7 @@ Thing { Radius = 1; Height = 1; Mass = 100; - Flags = "mf_dropoff mf_nogravity mf_viewalign mf_noclip mf_altshadow"; + Flags = "mf_noblockmap mf_dropoff mf_nogravity mf_viewalign mf_noclip mf_altshadow"; Flags2 = "mf2_noteleport"; } @@ -6068,7 +6085,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_shadow"; + Flags = "mf_noblockmap mf_nogravity mf_shadow"; } Thing { @@ -6094,7 +6111,7 @@ Thing { Height = 8; Mass = 100; Damage = 4; - Flags = "mf_dropoff mf_nogravity mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_dropoff mf_nogravity mf_missile mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -6119,7 +6136,7 @@ Thing { Radius = 4; Height = 8; Mass = 100; - Flags = "mf_dropoff mf_nogravity mf_viewalign mf_altshadow"; + Flags = "mf_noblockmap mf_dropoff mf_nogravity mf_viewalign mf_altshadow"; Flags2 = "mf2_noteleport"; } @@ -6144,7 +6161,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_viewalign mf_nogravity"; + Flags = "mf_noblockmap mf_viewalign mf_nogravity"; Flags2 = "mf2_noteleport mf2_cannotpush mf2_nodmgthrust"; } @@ -6169,7 +6186,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_viewalign mf_shadow"; + Flags = "mf_noblockmap mf_nogravity mf_viewalign mf_shadow"; Flags2 = "mf2_noteleport mf2_cannotpush mf2_nodmgthrust"; } @@ -6196,7 +6213,7 @@ Thing { Height = 8; Mass = 100; Damage = 2; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_rip mf2_impact mf2_pcross mf2_nodmgthrust mf2_cannotpush"; } @@ -6247,7 +6264,7 @@ Thing { Height = 40; Mass = 100; Damage = 8; - Flags = "mf_nogravity mf_missile mf_brightexplode mf_dropoff"; + Flags = "mf_noblockmap mf_nogravity mf_missile mf_brightexplode mf_dropoff"; Flags2 = "mf2_noteleport mf2_impact mf2_pcross"; } @@ -6274,7 +6291,7 @@ Thing { Height = 40; Mass = 100; Damage = 8; - Flags = "mf_nogravity mf_missile mf_brightexplode mf_dropoff"; + Flags = "mf_noblockmap mf_nogravity mf_missile mf_brightexplode mf_dropoff"; Flags2 = "mf2_noteleport mf2_impact mf2_pcross"; } @@ -6300,7 +6317,7 @@ Thing { Height = 35; Mass = 100; Damage = 2; - Flags = "mf_nogravity mf_missile mf_brightexplode mf_viewalign mf_dropoff"; + Flags = "mf_noblockmap mf_nogravity mf_missile mf_brightexplode mf_viewalign mf_dropoff"; } Thing { @@ -6326,7 +6343,7 @@ Thing { Height = 8; Mass = 100; Damage = 6; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_firedamage mf2_rip mf2_impact mf2_pcross"; } @@ -6353,7 +6370,7 @@ Thing { Height = 8; Mass = 100; Damage = 4; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_firedamage mf2_impact mf2_pcross mf2_seekermissile"; } @@ -6603,7 +6620,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_shadow"; + Flags = "mf_noblockmap mf_nogravity mf_shadow"; } Thing { @@ -6653,7 +6670,7 @@ Thing { Height = 8; Mass = 100; Damage = 1; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_impact mf2_pcross mf2_icedamage"; } @@ -6678,7 +6695,7 @@ Thing { Radius = 20; Height = 16; Mass = 5; - Flags = "mf_viewalign"; + Flags = "mf_noblockmap mf_viewalign"; } Thing { @@ -6702,7 +6719,7 @@ Thing { Radius = 2; Height = 4; Mass = 5; - Flags = "mf_missile mf_dropoff"; + Flags = "mf_noblockmap mf_missile mf_dropoff"; Flags2 = "mf2_noteleport mf2_cannotpush"; } @@ -6727,7 +6744,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_corpse"; + Flags = "mf_noblockmap mf_dropoff mf_corpse"; Flags2 = "mf2_noteleport"; } @@ -6777,7 +6794,7 @@ Thing { Radius = 4; Height = 4; Mass = 100; - Flags = "mf_dropoff"; + Flags = "mf_noblockmap mf_dropoff"; Flags2 = "mf2_lograv mf2_cannotpush"; } @@ -6802,7 +6819,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_altshadow"; + Flags = "mf_noblockmap mf_nogravity mf_altshadow"; } Thing { @@ -6826,7 +6843,7 @@ Thing { Radius = 3; Height = 4; Mass = 100; - Flags = "mf_dropoff mf_altshadow"; + Flags = "mf_noblockmap mf_dropoff mf_altshadow"; Flags2 = "mf2_lograv mf2_cannotpush mf2_floorclip"; } @@ -7009,7 +7026,7 @@ Thing { Height = 16; Mass = 100; Damage = 4; - Flags = "mf_missile mf_brightexplode mf_nogravity mf_dropoff"; + Flags = "mf_missile mf_brightexplode mf_noblockmap mf_nogravity mf_dropoff"; Flags2 = "mf2_noteleport mf2_impact mf2_pcross"; } @@ -7111,7 +7128,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_missile mf_dropoff mf_corpse"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_corpse"; Flags2 = "mf2_noteleport mf2_floorclip"; } @@ -7136,7 +7153,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_missile mf_dropoff mf_corpse"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_corpse"; Flags2 = "mf2_noteleport mf2_floorclip"; } @@ -7161,7 +7178,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_missile mf_dropoff mf_corpse"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_corpse"; Flags2 = "mf2_noteleport mf2_floorclip"; } @@ -7186,7 +7203,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_missile mf_dropoff mf_corpse"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_corpse"; Flags2 = "mf2_noteleport mf2_floorclip"; } @@ -7211,7 +7228,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_missile mf_dropoff mf_corpse"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_corpse"; Flags2 = "mf2_noteleport mf2_floorclip"; } @@ -7238,7 +7255,7 @@ Thing { Height = 6; Mass = 100; Damage = 5; - Flags = "mf_missile mf_brightexplode mf_nogravity mf_dropoff"; + Flags = "mf_missile mf_brightexplode mf_noblockmap mf_nogravity mf_dropoff"; Flags2 = "mf2_noteleport mf2_impact mf2_pcross mf2_firedamage"; } @@ -7290,7 +7307,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_missile mf_dropoff mf_corpse"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_corpse"; Flags2 = "mf2_noteleport mf2_floorclip"; } @@ -7315,7 +7332,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_missile mf_dropoff mf_corpse"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_corpse"; Flags2 = "mf2_noteleport mf2_floorclip"; } @@ -7340,7 +7357,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_missile mf_dropoff mf_corpse"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_corpse"; Flags2 = "mf2_noteleport mf2_floorclip"; } @@ -7365,7 +7382,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_missile mf_dropoff mf_corpse"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_corpse"; Flags2 = "mf2_noteleport mf2_floorclip"; } @@ -7390,7 +7407,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_missile mf_dropoff mf_corpse"; + Flags = "mf_noblockmap mf_missile mf_dropoff mf_corpse"; Flags2 = "mf2_noteleport mf2_floorclip"; } @@ -7417,7 +7434,7 @@ Thing { Height = 6; Mass = 100; Damage = 5; - Flags = "mf_missile mf_brightexplode mf_nogravity mf_dropoff"; + Flags = "mf_missile mf_brightexplode mf_noblockmap mf_nogravity mf_dropoff"; Flags2 = "mf2_noteleport mf2_impact mf2_pcross mf2_firedamage"; } @@ -7500,7 +7517,7 @@ Thing { Height = 6; Mass = 5; Damage = 5; - Flags = "mf_nogravity mf_dropoff mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_nogravity mf_dropoff mf_missile mf_brightexplode"; Flags2 = "mf2_noteleport mf2_impact mf2_pcross mf2_floorclip mf2_firedamage"; } @@ -7525,7 +7542,7 @@ Thing { Radius = 2; Height = 5; Mass = 5; - Flags = "mf_dropoff"; + Flags = "mf_noblockmap mf_dropoff"; Flags2 = "mf2_noteleport mf2_floorclip"; } @@ -7550,7 +7567,7 @@ Thing { Radius = 2; Height = 5; Mass = 5; - Flags = "mf_dropoff mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_dropoff mf_missile mf_brightexplode"; Flags2 = "mf2_noteleport mf2_floorclip"; } @@ -7575,7 +7592,7 @@ Thing { Radius = 2; Height = 5; Mass = 5; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport"; } @@ -7600,7 +7617,7 @@ Thing { Radius = 2; Height = 5; Mass = 5; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport"; } @@ -7655,7 +7672,7 @@ Thing { Height = 6; Mass = 100; Damage = 3; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_firedamage"; } @@ -7682,7 +7699,7 @@ Thing { Height = 12; Mass = 100; Damage = 4; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_firedamage"; } @@ -7708,7 +7725,7 @@ Thing { Height = 16; Mass = 100; Damage = 4; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_firedamage"; } @@ -7733,7 +7750,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_shadow"; + Flags = "mf_noblockmap mf_nogravity mf_shadow"; Flags2 = "mf2_noteleport"; } @@ -7758,7 +7775,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_shadow"; + Flags = "mf_noblockmap mf_nogravity mf_shadow"; Flags2 = "mf2_noteleport"; } @@ -7839,7 +7856,7 @@ Thing { Height = 10; Mass = 100; Damage = 4; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport"; } @@ -7864,6 +7881,7 @@ Thing { Radius = 5; Height = 10; Mass = 100; + Flags = "mf_noblockmap"; Flags2 = "mf2_lograv"; } @@ -7888,7 +7906,7 @@ Thing { Radius = 3; Height = 3; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -7912,7 +7930,7 @@ Thing { Radius = 3; Height = 3; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -7936,7 +7954,7 @@ Thing { Radius = 3; Height = 3; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; } Thing { @@ -7987,7 +8005,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_shadow mf_nogravity"; + Flags = "mf_shadow mf_noblockmap mf_nogravity"; } Thing { @@ -8011,7 +8029,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_shadow"; + Flags = "mf_noblockmap mf_nogravity mf_shadow"; } Thing { @@ -8035,7 +8053,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_shadow"; + Flags = "mf_noblockmap mf_nogravity mf_shadow"; } Thing { @@ -8061,7 +8079,7 @@ Thing { Height = 6; Mass = 100; Damage = 1; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_seekermissile"; } @@ -8116,7 +8134,7 @@ Thing { Height = 10; Mass = 100; Damage = 6; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_firedamage"; } @@ -8141,6 +8159,7 @@ Thing { Radius = 8; Height = 8; Mass = 100; + Flags = "mf_noblockmap"; Flags2 = "mf2_noteleport mf2_firedamage mf2_dontdraw"; } @@ -8607,7 +8626,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nosector"; + Flags = "mf_noblockmap mf_nosector"; Flags2 = "mf2_dontdraw"; } @@ -8632,7 +8651,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nosector"; + Flags = "mf_noblockmap mf_nosector"; Flags2 = "mf2_dontdraw"; } @@ -8788,7 +8807,7 @@ Thing { Radius = 3; Height = 5; Mass = 16; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport"; } @@ -8813,7 +8832,7 @@ Thing { Radius = 3; Height = 5; Mass = 16; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport"; } @@ -8838,7 +8857,7 @@ Thing { Radius = 3; Height = 5; Mass = 16; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport"; } @@ -8863,7 +8882,7 @@ Thing { Radius = 3; Height = 5; Mass = 16; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport"; } @@ -8888,7 +8907,7 @@ Thing { Radius = 3; Height = 5; Mass = 16; - Flags = "mf_dropoff mf_missile"; + Flags = "mf_noblockmap mf_dropoff mf_missile"; Flags2 = "mf2_noteleport"; } @@ -8915,7 +8934,7 @@ Thing { Height = 6; Mass = 15; Damage = 1; - Flags = "mf_nogravity mf_dropoff mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_nogravity mf_dropoff mf_missile mf_brightexplode"; Flags2 = "mf2_noteleport mf2_impact mf2_pcross mf2_floorclip mf2_firedamage"; } @@ -8969,7 +8988,7 @@ Thing { Height = 10; Mass = 100; Damage = 1; - Flags = "mf_missile mf_brightexplode mf_dropoff mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_dropoff mf_nogravity"; Flags2 = "mf2_noteleport mf2_icedamage"; } @@ -8994,7 +9013,7 @@ Thing { Radius = 1; Height = 1; Mass = 100; - Flags = "mf_nogravity mf_shadow mf_dropoff"; + Flags = "mf_noblockmap mf_nogravity mf_shadow mf_dropoff"; Flags2 = "mf2_noteleport"; } @@ -9021,7 +9040,7 @@ Thing { Height = 4; Mass = 100; Damage = 1; - Flags = "mf_dropoff mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_dropoff mf_missile mf_brightexplode"; Flags2 = "mf2_noteleport mf2_lograv mf2_icedamage"; } @@ -9046,7 +9065,7 @@ Thing { Radius = 1; Height = 1; Mass = 100; - Flags = "mf_dropoff"; + Flags = "mf_noblockmap mf_dropoff"; Flags2 = "mf2_noteleport mf2_lograv"; } @@ -9071,7 +9090,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_nogravity mf_altshadow mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_dropoff mf_nogravity mf_altshadow mf_missile mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -9096,7 +9115,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_nogravity mf_altshadow mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_dropoff mf_nogravity mf_altshadow mf_missile mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -9232,7 +9251,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_nogravity mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_nogravity mf_missile mf_brightexplode"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -9258,7 +9277,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_nogravity mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_nogravity mf_missile mf_brightexplode"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -9284,7 +9303,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_nogravity mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_nogravity mf_missile mf_brightexplode"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -9310,7 +9329,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_brightexplode"; Flags2 = "mf2_noteleport mf2_floorbounce"; } @@ -9336,7 +9355,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_nogravity"; + Flags = "mf_noblockmap mf_nogravity"; Flags2 = "mf2_noteleport"; } @@ -9361,7 +9380,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_altshadow"; + Flags = "mf_noblockmap mf_nogravity mf_altshadow"; Flags2 = "mf2_noteleport"; } @@ -9387,7 +9406,7 @@ Thing { Radius = 22; Height = 65; Mass = 100; - Flags = "mf_missile mf_brightexplode"; + Flags = "mf_noblockmap mf_missile mf_brightexplode"; Flags2 = "mf2_noteleport"; } @@ -9412,7 +9431,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_altshadow"; + Flags = "mf_noblockmap mf_nogravity mf_altshadow"; Flags2 = "mf2_noteleport"; } @@ -9438,7 +9457,7 @@ Thing { Radius = 10; Height = 10; Mass = 100; - Flags = "mf_missile mf_brightexplode mf_nogravity"; + Flags = "mf_noblockmap mf_missile mf_brightexplode mf_nogravity"; Flags2 = "mf2_noteleport"; } @@ -9463,7 +9482,7 @@ Thing { Radius = 5; Height = 5; Mass = 100; - Flags = "mf_dropoff"; + Flags = "mf_noblockmap mf_dropoff"; Flags2 = "mf2_noteleport mf2_lograv"; } @@ -9488,7 +9507,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nogravity mf_noclip mf_altshadow"; + Flags = "mf_noblockmap mf_nogravity mf_noclip mf_altshadow"; Flags2 = "mf2_noteleport"; } @@ -9568,7 +9587,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_nogravity mf_altshadow mf_missile mf_noclip"; + Flags = "mf_noblockmap mf_dropoff mf_nogravity mf_altshadow mf_missile mf_noclip"; Flags2 = "mf2_noteleport"; } @@ -9594,7 +9613,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_nogravity mf_altshadow mf_missile mf_noclip"; + Flags = "mf_noblockmap mf_dropoff mf_nogravity mf_altshadow mf_missile mf_noclip"; Flags2 = "mf2_noteleport"; } @@ -9620,7 +9639,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_nogravity mf_altshadow mf_missile mf_noclip"; + Flags = "mf_noblockmap mf_dropoff mf_nogravity mf_altshadow mf_missile mf_noclip"; Flags2 = "mf2_noteleport"; } @@ -9646,7 +9665,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_nogravity mf_altshadow mf_missile mf_noclip"; + Flags = "mf_noblockmap mf_dropoff mf_nogravity mf_altshadow mf_missile mf_noclip"; Flags2 = "mf2_noteleport"; } @@ -9672,7 +9691,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_nogravity mf_altshadow mf_missile mf_noclip"; + Flags = "mf_noblockmap mf_dropoff mf_nogravity mf_altshadow mf_missile mf_noclip"; Flags2 = "mf2_noteleport"; } @@ -9698,7 +9717,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_dropoff mf_nogravity mf_altshadow mf_missile mf_noclip"; + Flags = "mf_noblockmap mf_dropoff mf_nogravity mf_altshadow mf_missile mf_noclip"; Flags2 = "mf2_noteleport"; } @@ -9832,7 +9851,7 @@ Thing { Radius = 15; Height = 35; Mass = 100; - Flags = "mf_nogravity mf_missile mf_brightexplode mf_dropoff"; + Flags = "mf_noblockmap mf_nogravity mf_missile mf_brightexplode mf_dropoff"; Flags2 = "mf2_noteleport"; } @@ -9857,7 +9876,7 @@ Thing { Radius = 20; Height = 16; Mass = 100; - Flags = "mf_nosector mf_nogravity"; + Flags = "mf_noblockmap mf_nosector mf_nogravity"; Flags2 = "mf2_dontdraw"; } @@ -9883,7 +9902,7 @@ Thing { Radius = 3; Height = 3; Mass = 100; - Flags = "mf_nogravity mf_missile"; + Flags = "mf_noblockmap mf_nogravity mf_missile"; Flags2 = "mf2_passmobj mf2_noteleport"; } @@ -9909,7 +9928,7 @@ Thing { Radius = 10; Height = 10; Mass = 100; - Flags = "mf_nogravity mf_nosector mf_teleport mf_dropoff"; + Flags = "mf_nogravity mf_nosector mf_noblockmap mf_teleport mf_dropoff"; Flags2 = "mf2_passmobj mf2_slide mf2_cannotpush mf2_dontdraw"; } @@ -33906,7 +33925,7 @@ Thing { Radius = 1; Height = 1; Mass = 100; - Flags = "mf_local mf_nosector mf_nogravity"; + Flags = "mf_local mf_nosector mf_noblockmap mf_nogravity"; Flags2 = "mf2_dontdraw"; } diff --git a/doomsday/plugins/jhexen/include/p_mobj.h b/doomsday/plugins/jhexen/include/p_mobj.h index c828abc56a..b2a1049f17 100644 --- a/doomsday/plugins/jhexen/include/p_mobj.h +++ b/doomsday/plugins/jhexen/include/p_mobj.h @@ -58,7 +58,8 @@ #define MF_SHOOTABLE 4 #define MF_NOSECTOR 8 // don't use the sector links // (invisible but touchable) -//#define MF_UNUSED1 16 // Formerly MF_NOBLOCKMAP +#define MF_NOBLOCKMAP 16 // don't use the blocklinks + // (inert but displayable) #define MF_AMBUSH 32 #define MF_JUSTHIT 64 // try to attack right back #define MF_JUSTATTACKED 128 // take at least one step before attacking diff --git a/doomsday/plugins/jhexen/src/hrefresh.c b/doomsday/plugins/jhexen/src/hrefresh.c index 973ce48e6d..3dda2c632e 100644 --- a/doomsday/plugins/jhexen/src/hrefresh.c +++ b/doomsday/plugins/jhexen/src/hrefresh.c @@ -482,11 +482,11 @@ void R_SetAllDoomsdayFlags(void) mo->ddFlags |= DDMF_DONTDRAW; // Choose which ddflags to set. - if(mo->flags2 & MF2_DONTDRAW) + /*if(mo->flags2 & MF2_DONTDRAW) { mo->ddFlags |= DDMF_DONTDRAW; continue; // No point in checking the other flags. - } + }*/ if((mo->flags & MF_BRIGHTSHADOW) == MF_BRIGHTSHADOW) mo->ddFlags |= DDMF_BRIGHTSHADOW;