From c0adfe0e0a02b34612f5cd0d273f9fff60a45aab Mon Sep 17 00:00:00 2001 From: NepDisk Date: Wed, 17 Dec 2025 14:37:24 -0500 Subject: [PATCH] Enforce MF_PAIN doing regular damage in kart maps --- src/p_map.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p_map.c b/src/p_map.c index 2a683add0..3839bc2d0 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -674,8 +674,8 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) return BMIT_CONTINUE; // underneath if (g_tm.thing->player && g_tm.thing->flags & MF_SHOOTABLE && thing->health > 0) { - UINT32 damagetype = (g_tm.thing->info->mass & DMG_TYPEMASK); - if (!damagetype) // OWWWWW! + UINT32 damagetype = (thing->info->mass & DMG_TYPEMASK); + if (mapnamespace == MNS_SRB2KART || !damagetype) // OWWWWW! damagetype = DMG_NORMAL; P_DamageMobj(g_tm.thing, thing, thing, 1, damagetype); } @@ -691,7 +691,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) if (thing->player && thing->flags & MF_SHOOTABLE && g_tm.thing->health > 0) { UINT32 damagetype = (g_tm.thing->info->mass & DMG_TYPEMASK); - if (!damagetype) // OWWWWW! + if (mapnamespace == MNS_SRB2KART || !damagetype) // OWWWWW! damagetype = DMG_NORMAL; P_DamageMobj(thing, g_tm.thing, g_tm.thing, 1, damagetype); }