From e510e71617a2102001d5038dbc48c7abdf855792 Mon Sep 17 00:00:00 2001
From: Radicalicious <sonic_edge@hfcom.org>
Date: Fri, 23 Apr 2021 15:50:48 -0400
Subject: [PATCH] Remove fire shield flash
---
src/p_mobj.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 7ba6d1fad9..59f306d1d7 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -3283,11 +3283,9 @@ void P_MobjCheckWater(mobj_t *mobj)
boolean electric = !!(p->powers[pw_shield] & SH_PROTECTELECTRIC);
if (electric || ((p->powers[pw_shield] & SH_PROTECTFIRE) && !(p->powers[pw_shield] & SH_PROTECTWATER) && !(mobj->eflags & MFE_TOUCHLAVA)))
{ // Water removes electric and non-water fire shields...
- P_FlashPal(p,
- electric
- ? PAL_WHITE
- : PAL_NUKE,
- 1);
+ if (electric)
+ P_FlashPal(p, PAL_WHITE, 1);
+
p->powers[pw_shield] = p->powers[pw_shield] & SH_STACK;
}
}
--
GitLab