mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-21 20:11:12 +00:00
Re-add player check(s) for MF_SPECIAL objects in PIT_DoCheckThing
This commit is contained in:
parent
556ed31b1f
commit
a74fcf7c49
1 changed files with 2 additions and 2 deletions
|
@ -1465,13 +1465,13 @@ static unsigned PIT_DoCheckThing(mobj_t *thing)
|
||||||
}
|
}
|
||||||
|
|
||||||
// check for special pickup
|
// check for special pickup
|
||||||
if (thing->flags & MF_SPECIAL)
|
if (thing->flags & MF_SPECIAL && (tmthing->player || (tmthing->flags & MF_PUSHABLE))) // MF_PUSHABLE added for steam jets
|
||||||
{
|
{
|
||||||
P_TouchSpecialThing(thing, tmthing, true); // can remove thing
|
P_TouchSpecialThing(thing, tmthing, true); // can remove thing
|
||||||
return CHECKTHING_COLLIDE;
|
return CHECKTHING_COLLIDE;
|
||||||
}
|
}
|
||||||
// check again for special pickup
|
// check again for special pickup
|
||||||
if (tmthing->flags & MF_SPECIAL)
|
if (tmthing->flags & MF_SPECIAL && (thing->player || (thing->flags & MF_PUSHABLE))) // MF_PUSHABLE added for steam jets
|
||||||
{
|
{
|
||||||
P_TouchSpecialThing(tmthing, thing, true); // can remove thing
|
P_TouchSpecialThing(tmthing, thing, true); // can remove thing
|
||||||
return CHECKTHING_COLLIDE;
|
return CHECKTHING_COLLIDE;
|
||||||
|
|
Loading…
Reference in a new issue