From ecd867ab3552ad310f0edd0d006e3c14ec514f29 Mon Sep 17 00:00:00 2001 From: Yukita Mayako Date: Wed, 27 May 2015 21:08:30 -0400 Subject: [PATCH] Change A_BombShield to add P_BlackOw. Now when you obtain an Armageddon Shield, and you already HAVE one, the first one explodes _while_ applying the second. --- src/p_enemy.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index ef9ff5dda..7d94e105d 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3200,12 +3200,13 @@ void A_BombShield(mobj_t *actor) player = actor->target->player; - if ((player->powers[pw_shield] & SH_NOSTACK) != SH_BOMB) - { - player->powers[pw_shield] = SH_BOMB|(player->powers[pw_shield] & SH_STACK); - P_SpawnShieldOrb(player); - } + // If you already have a bomb shield, use it! + if ((player->powers[pw_shield] & SH_NOSTACK) == SH_BOMB) + P_BlackOw(player); + // Now we know for certain that we don't have a bomb shield, so add one. :3 + player->powers[pw_shield] = SH_BOMB|(player->powers[pw_shield] & SH_STACK); + P_SpawnShieldOrb(player); S_StartSound(player->mo, actor->info->seesound); }