thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

VC requests for auto-naming AltMusic Challenge

Browse source 
- Replace the track #1/#2 with side B/C
- Add invalid map-set text
This commit is contained in:
toaster 2023-10-20 20:39:16 +01:00
parent 5aa71fb43e
commit 91f411d52b
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/m_cond.c
View file

@ -1036,6 +1036,8 @@ static void M_PrecacheLevelLocks(void)
case SECRET_ALTMUSIC: case SECRET_ALTMUSIC:
{ {
UINT16 map = M_UnlockableMapNum(&unlockables[i]); UINT16 map = M_UnlockableMapNum(&unlockables[i]);
const char *tempstr = NULL;
if (map < nummapheaders if (map < nummapheaders
&& mapheaderinfo[map]) && mapheaderinfo[map])
{ {
@ -1048,7 +1050,6 @@ static void M_PrecacheLevelLocks(void)
mapheaderinfo[map]->cache_muslock[j - 1] = i; mapheaderinfo[map]->cache_muslock[j - 1] = i;
const char *tempstr = NULL;
UINT8 positionid = 0; UINT8 positionid = 0;
if (mapheaderinfo[map]->cup) if (mapheaderinfo[map]->cup)
@ -1070,11 +1071,11 @@ static void M_PrecacheLevelLocks(void)
} }
tempstr = va( tempstr = va(
"Music: %s Cup %c%u #%u", "Music: %s Cup %c%u %c",
mapheaderinfo[map]->cup->realname, mapheaderinfo[map]->cup->realname,
prefix, prefix,
positionid + 1, positionid + 1,
j 'A' + j // :D ?
); );
} }
} }
@ -1097,23 +1098,24 @@ static void M_PrecacheLevelLocks(void)
} }
tempstr = va( tempstr = va(
"Music: %s #%u #%u", "Music: %s #%u %c",
(mapheaderinfo[map]->typeoflevel & TOL_TUTORIAL) ? "Tutorial" : "Lost and Found", (mapheaderinfo[map]->typeoflevel & TOL_TUTORIAL) ? "Tutorial" : "Lost and Found",
positionid + 1, positionid + 1,
j 'A' + j // :D ?
); );
} }
if (tempstr != NULL)
{
strlcpy(unlockables[i].name, tempstr, sizeof (unlockables[i].name));
}
break; break;
} }
if (j == mapheaderinfo[map]->musname_size) if (j == mapheaderinfo[map]->musname_size)
CONS_Alert(CONS_ERROR, "Unlockable %u: Too many SECRET_ALTMUSICs associated with Level %s\n", i, mapheaderinfo[map]->lumpname); CONS_Alert(CONS_ERROR, "Unlockable %u: Too many SECRET_ALTMUSICs associated with Level %s\n", i, mapheaderinfo[map]->lumpname);
} }
if (tempstr == NULL)
tempstr = va("INVALID MUSIC UNLOCK %u", i);
strlcpy(unlockables[i].name, tempstr, sizeof (unlockables[i].name));
break; break;
} }