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

add actually damaged check for egg mine damage

Browse source
This commit is contained in:
minenice55 2026-02-19 12:06:52 -05:00
parent 478a94a66f
commit 83977e0c98
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/k_collide.c
View file

@ -372,11 +372,10 @@ boolean K_EggMineCollide(mobj_t *t1, mobj_t *t2)
}
else if (t2->type == MT_PLAYER && t1->health > 1)
{
if (t1->health > 2)
if (t1->health > 2 && P_DamageMobj(t2, t1, t1->target, 1, DMG_FLIPOVER))
{
K_DoEggMineStrip(t2, t1, t1->target);
S_StartSound(t2, sfx_bsnipe);
P_DamageMobj(t2, t1, t1->target, 1, DMG_FLIPOVER);
P_RemoveMobj(t1);
return true;
}
@ -555,10 +554,12 @@ boolean K_LandMineCollide(mobj_t *t1, mobj_t *t2)
}
else
{
// these can only come from eggmines now
K_DoEggMineStrip(t2, t1, t1->target);
// Player Damage
P_DamageMobj(t2, t1, t1->target, 1, DMG_FLIPOVER);
if (P_DamageMobj(t2, t1, t1->target, 1, DMG_FLIPOVER))
{
// these can only come from eggmines now
K_DoEggMineStrip(t2, t1, t1->target);
}
}
P_SpawnMobj(t1->x, t1->y, t1->z, MT_MINEEXPLOSIONSOUND);