From 64b96c7192565b1f47561c9f4210ef2425e60b94 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Mon, 17 Sep 2018 21:16:27 -0400
Subject: [PATCH] 455: Don't interrupt current color fading
---
src/p_spec.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/p_spec.c b/src/p_spec.c
index a408b2140..b855e9641 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -3378,6 +3378,11 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
{
extracolormap_t *source_exc, *dest_exc, *exc;
+ // Prevent continuous execs from interfering on an existing fade
+ if (!(line->flags & ML_EFFECT5)
+ && sectors[secnum].fadecolormapdata)
+ continue;
+
if (line->flags & ML_TFERLINE) // use back colormap instead of target sector
sectors[secnum].extra_colormap = (line->sidenum[1] != 0xFFFF) ?
sides[line->sidenum[1]].colormap_data : NULL;