incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enforce MF_PAIN doing regular damage in kart maps

Browse source
This commit is contained in:
NepDisk 2025-12-17 14:37:24 -05:00
parent 2fe0fcf14c
commit c0adfe0e0a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_map.c
View file

@ -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);
}