stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-02 22:41:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore Ringslinger Collectable Behavior

Browse source
This commit is contained in:
SMS Alfredo 2023-10-05 12:04:46 -05:00
parent 7632113d57
commit 290fc9f81f
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/p_mobj.c
View file

@ -2386,6 +2386,23 @@ boolean P_ZMovement(mobj_t *mo)
// Remove from death pits. DON'T FUCKING DESPAWN IT DAMMIT
mo->fuse = 1;
return false;
case MT_BOUNCERING:
case MT_INFINITYRING:
case MT_AUTOMATICRING:
case MT_RAILRING:
case MT_EXPLOSIONRING:
case MT_SCATTERRING:
case MT_GRENADERING:
case MT_BOUNCEPICKUP:
case MT_RAILPICKUP:
case MT_AUTOPICKUP:
case MT_EXPLODEPICKUP:
case MT_SCATTERPICKUP:
case MT_GRENADEPICKUP:
//Don't remove respawning ringslinger collectables on death pits
if (!(mo->flags2 & MF2_DONTRESPAWN))
break;
/* FALLTHRU */
default:
if (mo->flags & MF_ENEMY || mo->flags & MF_BOSS || mo->type == MT_MINECART)
{