From 2113774a6a968c501945dcde9670277afdd139d0 Mon Sep 17 00:00:00 2001 From: MascaraSnake Date: Mon, 7 Oct 2019 09:01:17 +0200 Subject: [PATCH] Don't deplete special stage timer in water if you have water protection --- src/p_tick.c | 2 +- src/st_stuff.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/p_tick.c b/src/p_tick.c index 7606510fe..6b5c7980c 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -482,7 +482,7 @@ static inline void P_DoSpecialStageStuff(void) countspheres += players[i].spheres; // If in water, deplete timer 6x as fast. - if (players[i].mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER)) + if (players[i].mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER) && !(players[i].powers[pw_shield] & SH_PROTECTWATER)) players[i].nightstime -= 5; if (--players[i].nightstime > 6) { diff --git a/src/st_stuff.c b/src/st_stuff.c index 20a132b3a..b9ca0850a 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -1857,7 +1857,8 @@ static void ST_drawNiGHTSHUD(void) numbersize = 48/2; if ((oldspecialstage && leveltime & 2) - && (stplyr->mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER))) + && (stplyr->mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER)) + && !(stplyr->powers[pw_shield] & SH_PROTECTWATER)) col = SKINCOLOR_ORANGE; ST_DrawNightsOverlayNum((160 + numbersize)<