From 29e1e9e1b51f12e5184af5e864e0f3dc3d0fef93 Mon Sep 17 00:00:00 2001
From: Roman Fomin <rfomin@gmail.com>
Date: Thu, 12 Dec 2024 14:12:16 +0700
Subject: [PATCH] bring back extras.wad autoload, support for chex3v.wad IWAD
 (#2086)

* add "-noextras"
---
 src/d_iwad.c |  1 +
 src/d_main.c | 15 +++++++++++++++
 src/params.h |  1 +
 3 files changed, 17 insertions(+)

diff --git a/src/d_iwad.c b/src/d_iwad.c
index 040aee3b..cd1529a6 100644
--- a/src/d_iwad.c
+++ b/src/d_iwad.c
@@ -43,6 +43,7 @@ static const iwad_t iwads[] = {
     {"freedoom1.wad", doom,       retail,       "Freedoom: Phase 1"              },
     {"freedm.wad",    doom2,      commercial,   "FreeDM"                         },
     {"chex.wad",      pack_chex,  retail,       "Chex Quest"                     },
+    {"chex3v.wad",    pack_chex,  retail,       "Chex Quest 3: Vanilla Edition"  },
     {"hacx.wad",      pack_hacx,  commercial,   "HACX: Twitch n' Kill"           },
     {"rekkrsa.wad",   pack_rekkr, retail,       "REKKR"                          },
     {"rekkrsl.wad",   pack_rekkr, retail,       "REKKR: Sunken Land"             },
diff --git a/src/d_main.c b/src/d_main.c
index 988bbf30..36470e9d 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1873,6 +1873,21 @@ void D_DoomMain(void)
 
   IdentifyVersion();
 
+  //!
+  // @category mod
+  //
+  // Disable auto-loading of extars.wad file.
+  //
+
+  if (gamemission < pack_chex && !M_ParmExists("-noextras"))
+  {
+      char *path = D_FindWADByName("extras.wad");
+      if (path)
+      {
+          D_AddFile(path);
+      }
+  }
+
   // [FG] emulate a specific version of Doom
   InitGameVersion();
 
diff --git a/src/params.h b/src/params.h
index 004c49c8..1d911a61 100644
--- a/src/params.h
+++ b/src/params.h
@@ -44,6 +44,7 @@ static const char *params[] = {
 "-bsp",
 "-force_old_zdoom_nodes",
 "-noautoload",
+"-noextras",
 "-nocheats",
 "-nodeh",
 "-nomapinfo",