From d31fd95d7574d8cc50caa597e8ac45bbf8e75b95 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Thu, 7 Apr 2016 22:02:52 +0100
Subject: [PATCH] Armageddon & Sparkles confusion is no more, DMG_NUKE exists
to sort that out now
---
src/p_inter.c | 2 +-
src/p_local.h | 3 ++-
src/p_user.c | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/p_inter.c b/src/p_inter.c
index bc1857c20d..14667d21f8 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1586,7 +1586,7 @@ static void P_HitDeathMessages(player_t *player, mobj_t *inflictor, mobj_t *sour
else switch (inflictor->type)
{
case MT_PLAYER:
- if ((inflictor->player->powers[pw_shield] & SH_NOSTACK) == SH_BOMB)
+ if (damagetype == DMG_NUKE) // SH_BOMB, armageddon shield
str = M_GetText("%s%s's armageddon blast %s %s.\n");
else if (inflictor->player->powers[pw_invulnerability])
str = M_GetText("%s%s's invincibility aura %s %s.\n");
diff --git a/src/p_local.h b/src/p_local.h
index 583f115ef4..717f66d699 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -376,7 +376,8 @@ typedef struct BasicFF_s
#define DMG_FIRE 2
#define DMG_ELECTRIC 3
#define DMG_SPIKE 4
-//#define DMG_SPECIALSTAGE 5
+#define DMG_NUKE 5 // bomb shield
+//#define DMG_SPECIALSTAGE 6
//// Death types - cannot be combined with damage types
#define DMG_INSTAKILL 0x80
#define DMG_DROWNED 0x80+1
diff --git a/src/p_user.c b/src/p_user.c
index 4f9bca55e2..4cf75ef337 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -7440,12 +7440,12 @@ void P_NukeEnemies(mobj_t *inflictor, mobj_t *source, fixed_t radius)
mo->flags |= MF_SPECIAL|MF_SHOOTABLE;
if (mo->type == MT_EGGGUARD && mo->tracer) //nuke Egg Guard's shield!
- P_KillMobj(mo->tracer, inflictor, source, 0);
+ P_KillMobj(mo->tracer, inflictor, source, DMG_NUKE);
if (mo->flags & MF_BOSS || mo->type == MT_PLAYER) //don't OHKO bosses nor players!
- P_DamageMobj(mo, inflictor, source, 1, 0);
+ P_DamageMobj(mo, inflictor, source, 1, DMG_NUKE);
else
- P_DamageMobj(mo, inflictor, source, 1000, 0);
+ P_DamageMobj(mo, inflictor, source, 1000, DMG_NUKE);
}
}
--
GitLab