thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'the-scary-22-merge' of https://git.do.srb2.org/KartKrew/Kart into the-scary-22-merge

Browse source
This commit is contained in:
Sally Coolatta 2020-09-25 12:00:56 -04:00
commit d960ae5599
1 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/p_mobj.c
View file

@ -2174,30 +2174,14 @@ boolean P_ZMovement(mobj_t *mo)
if (!mo->player && P_CheckDeathPitCollide(mo)) if (!mo->player && P_CheckDeathPitCollide(mo))
{ {
switch (mo->type) if (mo->flags & MF_ENEMY || mo->flags & MF_BOSS || mo->type == MT_MINECART)
{ {
case MT_GHOST: // Kill enemies, bosses and minecarts that fall into death pits.
case MT_METALSONIC_RACE: if (mo->health)
case MT_EXPLODE: {
case MT_BOSSEXPLODE: P_KillMobj(mo, NULL, NULL, DMG_NORMAL);
case MT_SONIC3KBOSSEXPLODE: }
break; return false;
default:
if (mo->flags & MF_ENEMY || mo->flags & MF_BOSS || mo->type == MT_MINECART)
{
// Kill enemies, bosses and minecarts that fall into death pits.
if (mo->health)
{
P_KillMobj(mo, NULL, NULL, DMG_NORMAL);
}
return false;
}
else
{
P_RemoveMobj(mo);
return false;
}
break;
} }
} }
@ -2797,12 +2781,6 @@ boolean P_SceneryZMovement(mobj_t *mo)
break; break;
} }
if (P_CheckDeathPitCollide(mo))
{
P_RemoveMobj(mo);
return false;
}
// clip movement // clip movement
if (((mo->z <= mo->floorz && !(mo->eflags & MFE_VERTICALFLIP)) if (((mo->z <= mo->floorz && !(mo->eflags & MFE_VERTICALFLIP))
|| (mo->z + mo->height >= mo->ceilingz && mo->eflags & MFE_VERTICALFLIP)) || (mo->z + mo->height >= mo->ceilingz && mo->eflags & MFE_VERTICALFLIP))