incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10 from WumboSpasm/blockplayers

Browse source 
Make ML_BLOCKPLAYERS block players in UDMF maps only. Thanks Wumbo
This commit is contained in:
NepDisk 2024-09-07 21:48:23 -04:00 committed by GitHub
commit 227938e907
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/doomdata.h
View file

@ -105,7 +105,7 @@ enum
ML_IMPASSABLE = 0x00000001,
// Blocks enemies only
ML_BLOCKMONSTERS = 0x00000002,
ML_BLOCKMONSTERS = 0x00000002,
// Backside will not be present at all if not two sided.
ML_TWOSIDED = 0x00000004,
@ -142,7 +142,7 @@ enum
ML_NONET = 0x00001000,
// SRB2Kart: Blocks players only; items can be thrown through these.
ML_BLOCKPLAYERS = 0x00002000,
ML_BLOCKPLAYERS = 0x00002000,
// Don't bounce off this wall!
ML_NOTBOUNCY = 0x00004000,

4
src/p_map.c
View file

@ -1463,11 +1463,11 @@ boolean P_IsLineBlocking(const line_t *ld, const mobj_t *thing)
return true;
}
/*if (thing->player)
if (udmf && thing->player)
{
return ((ld->flags & ML_BLOCKPLAYERS) == ML_BLOCKPLAYERS);
}
else*/ if (thing->flags & (MF_ENEMY|MF_BOSS))
else if (thing->flags & (MF_ENEMY|MF_BOSS))
{
return ((ld->flags & ML_BLOCKMONSTERS) == ML_BLOCKMONSTERS);
}

6
src/p_setup.c
View file

@ -1880,7 +1880,7 @@ static void ParseTextmapLinedefParameter(UINT32 i, const char *param, const char
// Flags
else if (fastcmp(param, "blocking") && fastcmp("true", val))
lines[i].flags |= ML_IMPASSABLE;
else if (fastcmp(param, "blockplayers") && fastcmp("true", val))
else if (fastcmp(param, "blockmonsters") && fastcmp("true", val))
lines[i].flags |= ML_BLOCKMONSTERS;
else if (fastcmp(param, "twosided") && fastcmp("true", val))
lines[i].flags |= ML_TWOSIDED;
@ -1900,8 +1900,8 @@ static void ParseTextmapLinedefParameter(UINT32 i, const char *param, const char
lines[i].flags |= ML_MIDSOLID;
else if (fastcmp(param, "wrapmidtex") && fastcmp("true", val))
lines[i].flags |= ML_WRAPMIDTEX;
else if (fastcmp(param, "blockmonsters") && fastcmp("true", val))
lines[i].flags |= ML_BLOCKMONSTERS;
else if (fastcmp(param, "blockplayers") && fastcmp("true", val))
lines[i].flags |= ML_BLOCKPLAYERS;
else if (fastcmp(param, "nonet") && fastcmp("true", val))
lines[i].flags |= ML_NONET;
else if (fastcmp(param, "netonly") && fastcmp("true", val))