From 90591942ade34bddeeffd6c44c500115a94af556 Mon Sep 17 00:00:00 2001 From: toaster Date: Wed, 15 Mar 2023 17:33:55 +0000 Subject: [PATCH] musicwads Record number of music files which we were able to add, so Addons menu shows the correct number of addons loaded. Also marks main music files in `listwad` command. --- src/d_main.c | 3 +++ src/d_netcmd.c | 2 +- src/doomstat.h | 1 + src/g_game.c | 1 + src/k_menudraw.c | 2 +- 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 3e0db9357..a7f327403 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1208,7 +1208,10 @@ static void IdentifyVersion(void) const char *musicpath = va(pandf,srb2waddir,str);\ int ms = W_VerifyNMUSlumps(musicpath, false); \ if (ms == 1) \ + { \ D_AddFile(startupiwads, musicpath); \ + musicwads++; \ + } \ else if (ms == 0) \ I_Error("File "str" has been modified with non-music/sound lumps"); \ } diff --git a/src/d_netcmd.c b/src/d_netcmd.c index e95d0792c..8f0780da9 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -4646,7 +4646,7 @@ static void Command_ListWADS_f(void) else if (i <= mainwads) CONS_Printf("\x82 * %.2d\x80: %s\n", i, tempname); else if (!wadfiles[i]->important) - CONS_Printf("\x86 %.2d: %s\n", i, tempname); + CONS_Printf("\x86 %c %.2d: %s\n", ((i <= mainwads + musicwads) ? '*' : ' '), i, tempname); else CONS_Printf(" %.2d: %s\n", i, tempname); } diff --git a/src/doomstat.h b/src/doomstat.h index 33c200dbf..d79f3497f 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -132,6 +132,7 @@ struct recorddata_t extern boolean modifiedgame; extern boolean majormods; extern UINT16 mainwads; +extern UINT16 musicwads; extern boolean savemoddata; // This mod saves time/emblem data. extern boolean usedCheats; extern boolean imcontinuing; // Temporary flag while continuing diff --git a/src/g_game.c b/src/g_game.c index 2d4a86a2d..a552211d9 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -129,6 +129,7 @@ UINT8 numgameovers = 0; // for startinglives balance SINT8 startinglivesbalance[maxgameovers+1] = {3, 5, 7, 9, 12, 15, 20, 25, 30, 40, 50, 75, 99, 0x7F}; UINT16 mainwads = 0; +UINT16 musicwads = 0; boolean modifiedgame = false; // Set if homebrew PWAD stuff has been added. boolean majormods = false; // Set if Lua/Gameplay SOC/replacement map has been added. boolean savemoddata = false; diff --git a/src/k_menudraw.c b/src/k_menudraw.c index f1c61503c..08cde418c 100644 --- a/src/k_menudraw.c +++ b/src/k_menudraw.c @@ -4602,7 +4602,7 @@ void M_DrawAddons(void) if (modifiedgame) V_DrawSmallScaledPatch(x, y, 0, addonsp[NUM_EXT+2]); - m = numwadfiles-(mainwads+2+1); + m = numwadfiles-(mainwads+musicwads+1); V_DrawCenteredString(BASEVIDWIDTH/2, y+4, (majormods ? highlightflags : V_TRANSLUCENT), va("%ld ADD-ON%s LOADED", (long)m, (m == 1) ? "" : "S")); //+2 for music, sounds, +1 for main.kart }