Skip to content

Commit

Permalink
Fix wrong INTERPIC in TNT and Plutonia
Browse files Browse the repository at this point in the history
See #851. Thanks @Satku0!
  • Loading branch information
bradharding committed Dec 30, 2024
1 parent 660a3a1 commit 885b086
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
3 changes: 2 additions & 1 deletion releasenotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
14 changes: 12 additions & 2 deletions src/wi_stuff.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 885b086

Please sign in to comment.