From fa1ac4efd3d2c25a6cb37707f30a632b5f9be6a1 Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 24 Sep 2022 03:05:52 -0700 Subject: [PATCH] Let Drop Targets collide with other items immediately after being thrown see efc415e5 --- src/k_collide.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_collide.c b/src/k_collide.c index 322ab0cf3..80847fa01 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -514,7 +514,7 @@ boolean K_DropTargetCollide(mobj_t *t1, mobj_t *t2) { mobj_t *draggeddroptarget = (t1->type == MT_DROPTARGET_SHIELD) ? t1->target : NULL; - if (((t1->target == t2) || (t1->target == t2->target)) && (t1->threshold > 0 || (t2->type != MT_PLAYER && t2->threshold > 0))) + if (((t1->target == t2) || (t1->target == t2->target)) && ((t1->threshold > 0 && t2->type == MT_PLAYER) || (t2->type != MT_PLAYER && t2->threshold > 0))) return true; if (t1->health <= 0 || t2->health <= 0)