From e4eb42dd36f4b603593063e00db393b43dbfe9d6 Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 23 Dec 2023 08:49:27 -0800 Subject: [PATCH] MF_PAIN: remove sound effect functionality There is a Nova Shore enemy that switches between MF_SPRING and MF_ENEMY, and the upper bits of the mass field are conflicting. We don't use this functionality aside from some SRB2 holdovers, but who cares about those? ;) --- src/p_map.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/p_map.c b/src/p_map.c index 924ccd53c..4bfa24462 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -670,8 +670,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) { UINT32 damagetype = (thing->info->mass & 0xFF); - if (P_DamageMobj(tm.thing, thing, thing, 1, damagetype) && (damagetype = (thing->info->mass>>8))) - S_StartSound(thing, damagetype); + P_DamageMobj(tm.thing, thing, thing, 1, damagetype); if (P_MobjWasRemoved(tm.thing) || P_MobjWasRemoved(thing)) return BMIT_CONTINUE; @@ -690,8 +689,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) { UINT32 damagetype = (tm.thing->info->mass & 0xFF); - if (P_DamageMobj(thing, tm.thing, tm.thing, 1, damagetype) && (damagetype = (tm.thing->info->mass>>8))) - S_StartSound(tm.thing, damagetype); + P_DamageMobj(thing, tm.thing, tm.thing, 1, damagetype); if (P_MobjWasRemoved(tm.thing) || P_MobjWasRemoved(thing)) return BMIT_CONTINUE;