From ecfcc1356b7b999b21b88901ef8adafbeada0ce8 Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 18 Dec 2022 14:08:26 +0000 Subject: [PATCH] Don't permit duplicate maps across multiple cups in time attack. A map is only valid for its later groupings in Grand Prix and multiplayer. --- src/k_menufunc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/k_menufunc.c b/src/k_menufunc.c index dc292c5c1..3a57f68a1 100644 --- a/src/k_menufunc.c +++ b/src/k_menufunc.c @@ -3370,8 +3370,8 @@ boolean M_CanShowLevelInList(INT16 mapnum, UINT32 tol, cupheader_t *cup) if (levellist.timeattack && (mapheaderinfo[mapnum]->menuflags & LF2_NOTIMEATTACK)) return false; - // Don't permit cup when no cup requested - if (levellist.cupmode && !cup && mapheaderinfo[mapnum]->cup) + // Don't permit cup when no cup requested (also no dupes in time attack) + if (levellist.cupmode && (levellist.timeattack || !cup) && mapheaderinfo[mapnum]->cup != cup) return false; // Survived our checks.