From 91682c3250808e6af081a76630cca3400bb6eab0 Mon Sep 17 00:00:00 2001 From: toaster Date: Thu, 7 Dec 2023 16:36:04 +0000 Subject: [PATCH] Fix transitions for Level Select -> Time Attack Previous version was too specific --- src/k_menudraw.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/k_menudraw.c b/src/k_menudraw.c index 47569a85f..b33893c29 100644 --- a/src/k_menudraw.c +++ b/src/k_menudraw.c @@ -3080,27 +3080,29 @@ void M_DrawLevelSelect(void) M_DrawCupTitle(tay, &levellist.levelsearch); } +static boolean M_LevelSelectHasBG(menu_t *check) +{ + if (check == NULL) + check = currentMenu; + + return (check == &PLAY_LevelSelectDef + || check == &PLAY_CupSelectDef); +} + static boolean M_LevelSelectToTimeAttackTransitionHelper(void) { if (menutransition.tics == 0) return false; - return \ - ( - menutransition.startmenu == &PLAY_LevelSelectDef - && menutransition.endmenu == &PLAY_TimeAttackDef - ) || ( - menutransition.endmenu == &PLAY_LevelSelectDef - && menutransition.startmenu == &PLAY_TimeAttackDef - ); + return (M_LevelSelectHasBG(menutransition.startmenu)) + != M_LevelSelectHasBG(menutransition.endmenu); } void M_DrawSealedBack(void) { V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); - if (currentMenu != &PLAY_LevelSelectDef - && currentMenu != &PLAY_CupSelectDef) + if (M_LevelSelectHasBG(currentMenu) == false) return; INT32 translucencylevel = 7;