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

Actually fix bubbleshield hitem

Browse source 
I love my eyes
This commit is contained in:
NepDisk 2025-07-18 17:36:11 -04:00
parent ec648f4202
commit e62684d113
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_collide.c
View file

@ -591,7 +591,7 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2)
// Player Damage
if (K_KartBouncing(t2, t1->target, false, true))
{
P_DamageMobj(t2, t1->target, t1, 1, DMG_NORMAL);
P_DamageMobj(t2, t1, t1->target, 1, DMG_NORMAL);
K_BubbleShieldCollideDrain(t1->target->player, t1);
S_StartSound(t2, sfx_s3k44);
}

8
src/p_inter.c
View file

@ -2260,13 +2260,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
}
}
// Fix for bubble shield hit having no hit em!!!!!!
{
mobj_t *attacker = source->player ? source : NULL;
if (!attacker && source->target && source->target->player)
attacker = source->target;
K_TryHurtSoundExchange(target, attacker);
}
K_TryHurtSoundExchange(target, source);
}
else
{