stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'resolidify-enemies' into 'next'

Browse source 
Fix enemy solidity

See merge request STJr/SRB2!2503
This commit is contained in:
Lactozilla 2024-08-24 20:28:10 +00:00
commit 84aab3f07c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_map.c
View file

@ -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;