From 4481911cd4e830ec7c82d55a2203ff39c67f3f1d Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 21 Apr 2025 14:16:18 +0200 Subject: [PATCH] only check for votescreen replacements if we havent already replaced everything --- src/p_setup.c | 51 +++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index 8d62130d0..a5cf90a2d 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3348,35 +3348,38 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local) // // check for votescreen replacements // - lumpinfo = wadfiles[wadnum]->lumpinfo; - for (i = 0; i < numlumps; i++, lumpinfo++) + if (!wideracereplaced && !racereplaced && !widebattlereplaced && !battlereplaced) { - name = lumpinfo->name; - - // widescreen patch Race - if (!wideracereplaced && !strncmp(name, "INTERSCW", 8)) + lumpinfo = wadfiles[wadnum]->lumpinfo; + for (i = 0; i < numlumps; i++, lumpinfo++) { - wideracereplaced = true; - continue; - } + name = lumpinfo->name; - if (!racereplaced && !strncmp(name, "INTERSCR", 8)) - { - racereplaced = true; - continue; - } + // widescreen patch Race + if (!wideracereplaced && !strncmp(name, "INTERSCW", 8)) + { + wideracereplaced = true; + continue; + } - // widescreen patch Battle - if (!widebattlereplaced && !strncmp(name, "BATTLSCW", 8)) - { - widebattlereplaced = true; - continue; - } + if (!racereplaced && !strncmp(name, "INTERSCR", 8)) + { + racereplaced = true; + continue; + } - if (!battlereplaced && !strncmp(name, "BATTLSCR", 8)) - { - battlereplaced = true; - continue; + // widescreen patch Battle + if (!widebattlereplaced && !strncmp(name, "BATTLSCW", 8)) + { + widebattlereplaced = true; + continue; + } + + if (!battlereplaced && !strncmp(name, "BATTLSCR", 8)) + { + battlereplaced = true; + continue; + } } }