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

Merge branch 'fix-drop-target-crusher-crash' into 'master'

Browse source 
Check for removed target of MT_DROPTARGET_SHIELD

See merge request KartKrew/Kart!1939
This commit is contained in:
James R. 2024-02-24 07:12:54 +00:00
commit 5a38b4238f
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/k_collide.cpp
View file

@ -520,6 +520,9 @@ boolean K_DropTargetCollide(mobj_t *t1, mobj_t *t2)
if (t2->player && (t2->player->hyudorotimer || t2->player->justbumped))
return true;
if (draggeddroptarget && P_MobjWasRemoved(draggeddroptarget))
draggeddroptarget = NULL; // Beware order-of-execution on crushers, I guess?!
if (t1->health > 3) // forward thrown
{
strength = 0;
@ -650,7 +653,7 @@ boolean K_DropTargetCollide(mobj_t *t1, mobj_t *t2)
S_StartSound(t2, sfx_kdtrg1);
}
if (draggeddroptarget && draggeddroptarget->player)
if (draggeddroptarget && !P_MobjWasRemoved(draggeddroptarget) && draggeddroptarget->player)
{
// The following removes t1, be warned
// (its newly assigned properties are moved across)