From 03149d7810d7b35de62690776dc96144f968d539 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Wed, 6 Jan 2021 23:16:02 -0500 Subject: [PATCH] Only do touch damage when confirming a bump Should fix the mcdonalds rings --- src/p_map.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/p_map.c b/src/p_map.c index fe1055a3e..3d1b90493 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -1299,8 +1299,10 @@ static boolean PIT_CheckThing(mobj_t *thing) P_DamageMobj(tmthing, thing, thing, 1, DMG_WIPEOUT|DMG_STEAL); } - K_KartBouncing(mo1, mo2, zbounce, false); - K_PvPTouchDamage(mo1, mo2); + if (K_KartBouncing(mo1, mo2, zbounce, false)) + { + K_PvPTouchDamage(mo1, mo2); + } } return true;