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

Prevent the exploding barrel segfault

Browse source
This commit is contained in:
Anonimus 2025-11-02 01:39:23 -04:00
parent 601c0999b4
commit 28aaf02734
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/k_collide.c
View file

@ -679,7 +679,12 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2)
if (reflected)
{
// Drain my stuff please.
K_BubbleShieldCollideDrain(t1->target->player, t1, K_GetBubbleDamage(t2));
if ((!P_MobjWasRemoved(t1)) && (t1->target) && (t1->target->player))
{
K_BubbleShieldCollideDrain(t1->target->player,
t1,
K_GetBubbleDamage(t2));
}
}
return reflected;
@ -692,7 +697,14 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2)
if (shootable)
{
// Drain my stuff please.
K_BubbleShieldCollideDrain(t1->target->player, t1, K_GetBubbleDamage(t2));
// FfffffFFFFUCKING EXPLODING BARRELS AAAAAA
if ((!P_MobjWasRemoved(t1)) && (t1->target) && (t1->target->player))
{
K_BubbleShieldCollideDrain(t1->target->player,
t1,
K_GetBubbleDamage(t2));
}
}
return shootable;