Never consider TEST RUN locked

- Repairs access to TEST RUN cup
- We want to make it an unlockable later, so...
- M_MapLocked data types corrected
This commit is contained in:
toaster 2023-03-12 20:41:00 +00:00
parent 241475155b
commit 425f260914
3 changed files with 4 additions and 4 deletions

View file

@ -1838,7 +1838,7 @@ boolean M_CupLocked(cupheader_t *cup)
return false; return false;
} }
boolean M_MapLocked(INT32 mapnum) boolean M_MapLocked(UINT16 mapnum)
{ {
UINT8 i; UINT8 i;
@ -1851,7 +1851,7 @@ boolean M_MapLocked(INT32 mapnum)
if (marathonmode) if (marathonmode)
return false; return false;
if (!mapnum || mapnum > nummapheaders) if (mapnum <= 1 || mapnum > nummapheaders)
return false; return false;
if (!mapheaderinfo[mapnum-1]) if (!mapheaderinfo[mapnum-1])

View file

@ -341,7 +341,7 @@ UINT8 M_CompletionEmblems(void);
boolean M_CheckNetUnlockByID(UINT8 unlockid); boolean M_CheckNetUnlockByID(UINT8 unlockid);
boolean M_SecretUnlocked(INT32 type, boolean local); boolean M_SecretUnlocked(INT32 type, boolean local);
boolean M_CupLocked(cupheader_t *cup); boolean M_CupLocked(cupheader_t *cup);
boolean M_MapLocked(INT32 mapnum); boolean M_MapLocked(UINT16 mapnum);
INT32 M_CountMedals(boolean all, boolean extraonly); INT32 M_CountMedals(boolean all, boolean extraonly);
// Emblem shit // Emblem shit

View file

@ -58,7 +58,7 @@ boolean M_CanShowLevelInList(INT16 mapnum, levelsearch_t *levelsearch)
return false; return false;
// Check for TOL // Check for TOL
if (!(mapheaderinfo[mapnum]->typeoflevel & levelsearch->typeoflevel)) if (mapheaderinfo[mapnum]->typeoflevel && !(mapheaderinfo[mapnum]->typeoflevel & levelsearch->typeoflevel))
return false; return false;
// Should the map be hidden? // Should the map be hidden?