zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: Blasted objects should also be subject to being checked with CanCollideWith.

Browse source
This commit is contained in:
Christoph Oelckers 2016-12-04 10:34:36 +01:00
parent 71e8f09126
commit 18b953dd50
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_map.cpp
View file

@ -1243,7 +1243,7 @@ bool PIT_CheckThing(FMultiBlockThingsIterator &it, FMultiBlockThingsIterator::Ch
// The checks here are to do this only for conditions that would later result in an action, calling this for everything would be too much of a drag if // The checks here are to do this only for conditions that would later result in an action, calling this for everything would be too much of a drag if
// too many scripted overrides were being used, as PIT_CheckThing is even called for touching all the monster corpses lying around. // too many scripted overrides were being used, as PIT_CheckThing is even called for touching all the monster corpses lying around.
if (((thing->flags & MF_SOLID) || (thing->flags6 & (MF6_TOUCHY | MF6_BUMPSPECIAL))) && if (((thing->flags & MF_SOLID) || (thing->flags6 & (MF6_TOUCHY | MF6_BUMPSPECIAL))) &&
((tm.thing->flags & (MF_SOLID|MF_MISSILE)) || (tm.thing->flags6 & MF6_BLOCKEDBYSOLIDACTORS) || (tm.thing->BounceFlags & BOUNCE_MBF))) ((tm.thing->flags & (MF_SOLID|MF_MISSILE)) || (tm.thing->flags2 & MF2_BLASTED) || (tm.thing->flags6 & MF6_BLOCKEDBYSOLIDACTORS) || (tm.thing->BounceFlags & BOUNCE_MBF)))
{ {
static unsigned VIndex = ~0u; static unsigned VIndex = ~0u;
if (VIndex == ~0u) if (VIndex == ~0u)