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

Revert a bruh moment from 2.2's development where, in order to fix statues and spikes from being visible on the death pit in CEZ, I made any object that comes into contact with a death pit and isn't on a whitelist delete itself.

Browse source 
(Now the Chao at the start of Sonic Speedway don't die immediately.)
This commit is contained in:
toaster 2020-09-25 15:15:30 +01:00
parent 953afddd03
commit e36da645d9
1 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/p_mobj.c
View file

@ -2174,15 +2174,6 @@ boolean P_ZMovement(mobj_t *mo)
if (!mo->player && P_CheckDeathPitCollide(mo)) if (!mo->player && P_CheckDeathPitCollide(mo))
{ {
switch (mo->type)
{
case MT_GHOST:
case MT_METALSONIC_RACE:
case MT_EXPLODE:
case MT_BOSSEXPLODE:
case MT_SONIC3KBOSSEXPLODE:
break;
default:
if (mo->flags & MF_ENEMY || mo->flags & MF_BOSS || mo->type == MT_MINECART) if (mo->flags & MF_ENEMY || mo->flags & MF_BOSS || mo->type == MT_MINECART)
{ {
// Kill enemies, bosses and minecarts that fall into death pits. // Kill enemies, bosses and minecarts that fall into death pits.
@ -2192,13 +2183,6 @@ boolean P_ZMovement(mobj_t *mo)
} }
return false; return false;
} }
else
{
P_RemoveMobj(mo);
return false;
}
break;
}
} }
if (P_MobjFlip(mo)*mo->momz < 0 if (P_MobjFlip(mo)*mo->momz < 0
@ -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))