thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-22 10:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-sourceless-capsule-kills' into 'master'

Browse source 
Capsule followers use target flags if no source (fixes crash)

See merge request KartKrew/Kart!1645
This commit is contained in:
Oni 2023-11-19 05:14:54 +00:00
commit fa7b2f2076
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/p_inter.c
View file

@ -2150,9 +2150,19 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
cur->scalespeed = cur->destscale/TICRATE; cur->scalespeed = cur->destscale/TICRATE;
cur->z -= cur->height/2; cur->z -= cur->height/2;
// flags are NOT from the target - just in case it's just been placed on the ceiling as a gimmick if (source && !P_MobjWasRemoved(source))
cur->flags2 |= (source->flags2 & MF2_OBJECTFLIP); {
cur->eflags |= (source->eflags & MFE_VERTICALFLIP); // flags are NOT from the target - just in case it's just been placed on the ceiling as a gimmick
cur->flags2 |= (source->flags2 & MF2_OBJECTFLIP);
cur->eflags |= (source->eflags & MFE_VERTICALFLIP);
}
else
{
// Welp, nothing to be done here
cur->flags2 |= (target->flags2 & MF2_OBJECTFLIP);
cur->eflags |= (target->eflags & MFE_VERTICALFLIP);
}
launchangle = FixedAngle( launchangle = FixedAngle(
( (