Skip to content

Commit

Permalink
Add ML_BLOCKPLAYERS
Browse files Browse the repository at this point in the history
  • Loading branch information
kraflab committed Apr 12, 2021
1 parent 17da52c commit 687237e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions prboom2/src/doomdata.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ typedef struct {

// mbf21
#define ML_BLOCKLANDMONSTERS 4096
#define ML_BLOCKPLAYERS 8192

// Sector definition, from editing.
typedef struct {
Expand Down
4 changes: 3 additions & 1 deletion prboom2/src/p_map.c
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,9 @@ dboolean PIT_CheckLine (line_t* ld)
// killough 8/10/98: allow bouncing objects to pass through as missiles
if (!(tmthing->flags & (MF_MISSILE | MF_BOUNCES)))
{
if (ld->flags & ML_BLOCKING) // explicitly blocking everything
// explicitly blocking everything
// or blocking player
if (ld->flags & ML_BLOCKING || (mbf21 && tmthing->player && ld->flags & ML_BLOCKPLAYERS))
return tmunstuck && !untouched(ld); // killough 8/1/98: allow escape

// killough 8/9/98: monster-blockers don't affect friends
Expand Down

0 comments on commit 687237e

Please sign in to comment.