From d7321fd8c44d82d9953f43bf2aff5dec024abf73 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 16 Dec 2018 16:40:40 -0500 Subject: [PATCH 1/2] Pull expanded NMUSlist from 2.2 --- src/w_wad.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/w_wad.c b/src/w_wad.c index e1cd16ae9..bc5473eab 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -1667,15 +1667,26 @@ int W_VerifyNMUSlumps(const char *filename) // ENDOOM text and palette lumps lumpchecklist_t NMUSlist[] = { - {"D_", 2}, - {"O_", 2}, - {"DS", 2}, - {"ENDOOM", 6}, - {"PLAYPAL", 7}, - {"COLORMAP", 8}, - {"PAL", 3}, - {"CLM", 3}, - {"TRANS", 5}, + {"D_", 2}, // MIDI music + {"O_", 2}, // Digital music + {"DS", 2}, // Sound effects + + {"ENDOOM", 6}, // ENDOOM text lump + + {"PLAYPAL", 7}, // Palette changes + {"PAL", 3}, // Palette changes + {"COLORMAP", 8}, // Colormap changes + {"CLM", 3}, // Colormap changes + {"TRANS", 5}, // Translucency map changes + + {"LTFNT", 5}, // Level title font changes + {"TTL", 3}, // Act number changes + {"STCFN", 5}, // Console font changes + {"TNYFN", 5}, // Tiny console font changes + {"STT", 3}, // Acceptable HUD changes (Score Time Rings) + {"YB_", 3}, // Intermission graphics, goes with the above + {"M_", 2}, // As does menu stuff + {NULL, 0}, }; return W_VerifyFile(filename, NMUSlist, false); From 1b7a9aaa015e10196ccb6bad9cbe0cb4f62b9897 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 16 Dec 2018 16:53:13 -0500 Subject: [PATCH 2/2] 2.1 Score/Time/Rings lump name --- src/w_wad.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/w_wad.c b/src/w_wad.c index bc5473eab..b67974a10 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -1683,7 +1683,8 @@ int W_VerifyNMUSlumps(const char *filename) {"TTL", 3}, // Act number changes {"STCFN", 5}, // Console font changes {"TNYFN", 5}, // Tiny console font changes - {"STT", 3}, // Acceptable HUD changes (Score Time Rings) + {"SBO", 3}, // Acceptable HUD changes (Score Time Rings) + {"RRINGS", 6}, // Rings HUD (not named as SBO) {"YB_", 3}, // Intermission graphics, goes with the above {"M_", 2}, // As does menu stuff