From 3c449f3908c6a5179b941280cda146d82beded92 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 7 Aug 2019 19:22:06 +0200 Subject: [PATCH] - delete the teaser logs from SVE.WAD. The way Strife has been set uo, it is not possible to have the full game and the teaser coexist without hackery. --- src/gamedata/w_wad.cpp | 2 +- wadsrc_extra/static/iwadinfo.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gamedata/w_wad.cpp b/src/gamedata/w_wad.cpp index 878ee2fd4b..16deadc900 100644 --- a/src/gamedata/w_wad.cpp +++ b/src/gamedata/w_wad.cpp @@ -895,7 +895,7 @@ void FWadCollection::RenameSprites (const TArray &deletelumps) } else if (LumpInfo[i].lump->Namespace == ns_global) { - if (LumpInfo[i].wadnum == GetIwadNum() && deletelumps.Find(LumpInfo[i].lump->Name) < deletelumps.Size()) + if (LumpInfo[i].wadnum >= GetIwadNum() && LumpInfo[i].wadnum <= GetMaxIwadNum() && deletelumps.Find(LumpInfo[i].lump->Name) < deletelumps.Size()) { LumpInfo[i].lump->Name[0] = 0; // Lump must be deleted from directory. } diff --git a/wadsrc_extra/static/iwadinfo.txt b/wadsrc_extra/static/iwadinfo.txt index 279c5842f8..fa4efa7b56 100644 --- a/wadsrc_extra/static/iwadinfo.txt +++ b/wadsrc_extra/static/iwadinfo.txt @@ -138,6 +138,7 @@ IWad MustContain = "MAP35", "I_RELB", "FXAA_F" BannerColors = "f0 f0 f0", "6b 3c 18" Required = "Strife: Quest for the Sigil" + DeleteLumps = "LOG5", "LOG6", "LOG7", "LOG8", "LOG9", "LOG122", "LOG1101", "LOG1102", "LOG1201", "LOG122" // SVE adds the teaser logs which clash with the full game. Load = "voices.wad" }