stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-02-10 10:10:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-double-bombs' into awful-mix

Browse source
This commit is contained in:
Latapostrophe 2020-03-13 13:52:37 +01:00
commit 67eeb819cb
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p_enemy.c
View file

@ -4022,6 +4022,9 @@ static inline boolean PIT_MineExplode(mobj_t *thing)
if (G_BattleGametype() && grenade->target && grenade->target->player && grenade->target->player->kartstuff[k_bumper] <= 0 && thing == grenade->target) if (G_BattleGametype() && grenade->target && grenade->target->player && grenade->target->player->kartstuff[k_bumper] <= 0 && thing == grenade->target)
return true; return true;
if (thing->player && thing->player->powers[pw_flashing] == K_GetKartFlashing(thing->player)) // we literally got bombed that frame
return true;
// see if it went over / under // see if it went over / under
if (grenade->z - explodedist > thing->z + thing->height) if (grenade->z - explodedist > thing->z + thing->height)
return true; // overhead return true; // overhead
@ -4032,8 +4035,6 @@ static inline boolean PIT_MineExplode(mobj_t *thing)
thing->z - grenade->z) > explodedist) thing->z - grenade->z) > explodedist)
return true; // Too far away return true; // Too far away
grenade->flags2 |= MF2_DEBRIS;
if (thing->player) // Looks like we're going to have to need a seperate function for this too if (thing->player) // Looks like we're going to have to need a seperate function for this too
K_ExplodePlayer(thing->player, grenade->target, grenade); K_ExplodePlayer(thing->player, grenade->target, grenade);
else else
@ -4080,6 +4081,8 @@ void A_MineExplode(mobj_t *actor)
K_SpawnMineExplosion(actor, SKINCOLOR_KETCHUP); K_SpawnMineExplosion(actor, SKINCOLOR_KETCHUP);
P_SpawnMobj(actor->x, actor->y, actor->z, MT_MINEEXPLOSIONSOUND); P_SpawnMobj(actor->x, actor->y, actor->z, MT_MINEEXPLOSIONSOUND);
actor->flags2 |= MF2_DEBRIS; // Set this flag to ensure that the explosion won't be effective more than 1 frame.
} }
//} //}