From f3af88200f9455ca80531b73ad7aa30dd36e616d Mon Sep 17 00:00:00 2001 From: toaster Date: Sat, 9 Mar 2024 22:34:51 +0000 Subject: [PATCH] S_PopulateSoundTestSequence: Show Tutorial maps before Cups Previously after Cups, as part of Lost & Found tracks --- src/s_sound.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/s_sound.c b/src/s_sound.c index d5cae81cf..a26ad51ef 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1317,7 +1317,22 @@ void S_PopulateSoundTestSequence(void) tail = &soundtest.sequence.next; - // We iterate over all cups. + // We iterate over all tutorial maps. + for (i = 0; i < nummapheaders; i++) + { + if (!mapheaderinfo[i]) + continue; + + if (mapheaderinfo[i]->cup != NULL) + continue; + + if ((mapheaderinfo[i]->typeoflevel & TOL_TUTORIAL) == 0) + continue; + + S_InsertMapIntoSoundTestSequence(i, &tail); + } + + // Next, we iterate over all cups. { cupheader_t *cup; for (cup = kartcupheaders; cup; cup = cup->next) @@ -1338,7 +1353,7 @@ void S_PopulateSoundTestSequence(void) } } - // Then, we iterate over all non-cupped maps. + // Then, we iterate over all remaining non-cupped maps. for (i = 0; i < nummapheaders; i++) { if (!mapheaderinfo[i]) @@ -1347,6 +1362,9 @@ void S_PopulateSoundTestSequence(void) if (mapheaderinfo[i]->cup != NULL) continue; + if (mapheaderinfo[i]->typeoflevel & TOL_TUTORIAL) + continue; + S_InsertMapIntoSoundTestSequence(i, &tail); }