incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cup changes to allow the same map in multiple

Browse source
This commit is contained in:
NepDisk 2025-03-13 13:55:28 -04:00
parent ad44ec0aa7
commit a5bb96ce9b
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/p_setup.c
View file

@ -9032,20 +9032,21 @@ UINT8 P_InitMapData(boolean existingmapheaders)
{
for (j = 0; j < CUPCACHE_MAX; j++)
{
// No level in this slot?
if (!cup->levellist[j])
continue;
// Already discovered?
if (cup->cachedlevels[j] != NEXTMAP_INVALID)
continue;
if (!cup->levellist[j] || strcasecmp(cup->levellist[j], name) != 0)
// Not your name?
if (strcasecmp(cup->levellist[j], name) != 0)
continue;
// Only panic about back-reference for non-bonus material.
if (j < MAXLEVELLIST)
{
if (mapheaderinfo[i]->cup)
I_Error("P_InitMapData: Map %s cannot appear in cups multiple times! (First in %s, now in %s)", name, mapheaderinfo[i]->cup->name, cup->name);
// Have a map recognise the first cup it's a part of.
if (!mapheaderinfo[i]->cup)
mapheaderinfo[i]->cup = cup;
}
cup->cachedlevels[j] = i;
}