From 885b086a752ebc2956bd76bce2d2b4a943419df8 Mon Sep 17 00:00:00 2001 From: Brad Harding Date: Mon, 30 Dec 2024 16:10:08 +1100 Subject: [PATCH] Fix wrong `INTERPIC` in TNT and Plutonia See #851. Thanks @Satku0! --- releasenotes.md | 3 ++- src/wi_stuff.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/releasenotes.md b/releasenotes.md index 45f96ea4b..925ca13d0 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -7,7 +7,8 @@ * An error is no longer displayed when trying to load the *BFG Edition* of *DOOM II: Hell On Earth*. * Weapons that use the [*MBF21*](https://doomwiki.org/wiki/MBF21)-compatible `A_ConsumeAmmo` code pointer no longer consume ammo when fired if infinite ammo is enabled using the `infiniteammo` CCMD. * Animated skies defined using the [*ID24*](https://doomwiki.org/wiki/ID24)-compatible [`SKYDEFS`](https://doomwiki.org/wiki/SKYDEFS) lump are now fully supported. -* Improvements have been made to when to clip sprites in liquid sectors when the `r_liquid_clipsprites` CVAR is `on`. +* Improvements have been made to the clipping of sprites in liquid sectors when the `r_liquid_clipsprites` CVAR is `on`. +* The correct `INTERPIC` lump is now always displayed when playing a PWAD for *Final DOOM: The Plutonia Experiment* or *Final DOOM: TNT - Evilution*. ![](https://github.com/bradharding/www.doomretro.com/raw/master/wiki/bigdivider.png) diff --git a/src/wi_stuff.c b/src/wi_stuff.c index 258939774..6e402b4f0 100644 --- a/src/wi_stuff.c +++ b/src/wi_stuff.c @@ -1474,9 +1474,19 @@ static void WI_LoadData(void) else if (gamemode == commercial) { if (gamemission == pack_plut) - lump = W_CacheLumpName("INTERPI2"); + { + if (W_GetNumLumps("INTERPIC") > 2) + lump = W_CacheLumpName("INTERPIC"); + else + lump = W_CacheLumpName("INTERPI2"); + } else if (gamemission == pack_tnt) - lump = W_CacheLumpName("INTERPI3"); + { + if (W_GetNumLumps("INTERPIC") > 2) + lump = W_CacheLumpName("INTERPIC"); + else + lump = W_CacheLumpName("INTERPI3"); + } else if (nerve) lump = W_CacheLumpNameFromResourceWAD("INTERPIC"); else