From 38d9875d4c89d68a94c79113665c2b93ca54facf Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 3 Dec 2023 16:11:29 -0800 Subject: [PATCH] Let player kill shootable objects if player can punt --- src/k_collide.cpp | 3 ++- src/p_map.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/k_collide.cpp b/src/k_collide.cpp index 568f87338..8c4a0c078 100644 --- a/src/k_collide.cpp +++ b/src/k_collide.cpp @@ -1233,7 +1233,8 @@ void K_PuntHazard(mobj_t *t1, mobj_t *t2) boolean K_PuntCollide(mobj_t *t1, mobj_t *t2) { - if (t1->flags & MF_DONTPUNT) + // MF_SHOOTABLE will get damaged directly, instead + if (t1->flags & (MF_DONTPUNT | MF_SHOOTABLE)) { return false; } diff --git a/src/p_map.c b/src/p_map.c index affb16159..33a6f8698 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -1616,6 +1616,17 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) K_KartBouncing(tm.thing, thing); return BMIT_CONTINUE; } + else if ((thing->flags & MF_SHOOTABLE) && K_PlayerCanPunt(tm.thing->player)) + { + // see if it went over / under + if (tm.thing->z > thing->z + thing->height) + return BMIT_CONTINUE; // overhead + if (tm.thing->z + tm.thing->height < thing->z) + return BMIT_CONTINUE; // underneath + + P_DamageMobj(thing, tm.thing, tm.thing, 1, DMG_NORMAL); + return BMIT_CONTINUE; + } else if (thing->flags & MF_SOLID) { // see if it went over / under