From 53b956f540c8a1d253fd4a762f5f97102f5c96f8 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 18 Nov 2018 04:39:34 -0500 Subject: [PATCH] Mirror a wipe if it's forced off and the counter-wipe is specified --- src/m_menu.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/m_menu.c b/src/m_menu.c index c89e303a3..fd035eb6a 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2675,6 +2675,14 @@ static void M_HandleMenuMetaState(menu_t *newMenu) wipetypepre = ((exitwipe && enterlevel <= exitlevel) || anceslevel < 0) ? exitwipe : INT16_MAX; wipetypepost = ((enterwipe && enterlevel >= exitlevel) || anceslevel < 0) ? enterwipe : INT16_MAX; wipegamestate = FORCEWIPE; + + // If just one of the above is a force not-wipe, + // mirror the other wipe. + if (wipetypepre != INT16_MAX && wipetypepost == INT16_MAX) + wipetypepost = wipetypepre; + else if (wipetypepost != INT16_MAX && wipetypepre == INT16_MAX) + wipetypepre = wipetypepost; + // D_Display runs the next step of processing } else