Merge branch 'chargeaura-fallout' into 'master'

Charge Aura visual: Remove in more cases

See merge request KartKrew/Kart!2296
This commit is contained in:
toaster 2024-04-15 15:07:03 +00:00
commit 749fb4e4f8

View file

@ -26,7 +26,11 @@
// cvmem: spawn time (used to offset flash) // cvmem: spawn time (used to offset flash)
void Obj_ChargeAuraThink (mobj_t *aura) void Obj_ChargeAuraThink (mobj_t *aura)
{ {
if (P_MobjWasRemoved(aura->target) || !aura->target->player || (aura->extravalue1 >= CHARGEAURA_BURSTTIME)) if (P_MobjWasRemoved(aura->target)
|| aura->target->health == 0
|| aura->target->destscale <= 1 // sealed star fall out
|| !aura->target->player
|| (aura->extravalue1 >= CHARGEAURA_BURSTTIME))
{ {
P_RemoveMobj(aura); P_RemoveMobj(aura);
} }