From 71b352cd677e4f25a1280987b22a05a12a8835ab Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Thu, 22 Feb 2024 03:11:00 -0700 Subject: [PATCH] Check for removed target of MT_DROPTARGET_SHIELD --- src/k_collide.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/k_collide.cpp b/src/k_collide.cpp index 0e6963374..4231bbeeb 100644 --- a/src/k_collide.cpp +++ b/src/k_collide.cpp @@ -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)