Make chex3v.wad its own mission pack, add support for chex3d2.wad. (#…

…2091) * Make Chex 3 Vanilla its own mission pack, and add support for the modding version. * Fix chex3d2 incorrectly using Final Doom behavior.
fabiangreffrath · Dec 15, 2024 · f07688a · f07688a
1 parent f154314
commit f07688a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/setup/multiplayer.c b/setup/multiplayer.c
@@ -282,6 +282,7 @@ static void UpdateSkillButton(void)
     switch(iwad->mission)
     {
         case pack_chex:
+        case pack_chex3v:
             skillbutton->values = chex_skills;
             break;
         case pack_hacx:

diff --git a/src/d_iwad.c b/src/d_iwad.c
@@ -28,25 +28,26 @@
 #include "m_misc.h"
 
 static const iwad_t iwads[] = {
-    {"doom2.wad",     doom2,      commercial,   "DOOM II: Hell on Earth"         },
-    {"plutonia.wad",  pack_plut,  commercial,   "Final DOOM: Plutonia Experiment"},
-    {"tnt.wad",       pack_tnt,   commercial,   "Final DOOM: TNT - Evilution"    },
+    {"doom2.wad",     doom2,       commercial,   "DOOM II: Hell on Earth"         },
+    {"plutonia.wad",  pack_plut,   commercial,   "Final DOOM: Plutonia Experiment"},
+    {"tnt.wad",       pack_tnt,    commercial,   "Final DOOM: TNT - Evilution"    },
     // "doom.wad" may be retail or registered
-    {"doom.wad",      doom,       indetermined, "DOOM"                           },
-    {"doom.wad",      doom,       registered,   "DOOM Registered"                },
-    {"doom.wad",      doom,       retail,       "The Ultimate DOOM"              },
+    {"doom.wad",      doom,        indetermined, "DOOM"                           },
+    {"doom.wad",      doom,        registered,   "DOOM Registered"                },
+    {"doom.wad",      doom,        retail,       "The Ultimate DOOM"              },
     // "doomu.wad" alias to allow retail wad to coexist with registered in the same folder
-    {"doomu.wad",     doom,       retail,       "The Ultimate DOOM"              },
-    {"doom1.wad",     doom,       shareware,    "DOOM Shareware"                 },
-    {"doom2f.wad",    doom2,      commercial,   "DOOM II: L'Enfer sur Terre"     },
-    {"freedoom2.wad", doom2,      commercial,   "Freedoom: Phase 2"              },
-    {"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"             },
+    {"doomu.wad",     doom,        retail,       "The Ultimate DOOM"              },
+    {"doom1.wad",     doom,        shareware,    "DOOM Shareware"                 },
+    {"doom2f.wad",    doom2,       commercial,   "DOOM II: L'Enfer sur Terre"     },
+    {"freedoom2.wad", doom2,       commercial,   "Freedoom: Phase 2"              },
+    {"freedoom1.wad", doom,        retail,       "Freedoom: Phase 1"              },
+    {"freedm.wad",    doom2,       commercial,   "FreeDM"                         },
+    {"chex.wad",      pack_chex,   retail,       "Chex Quest"                     },
+    {"chex3v.wad",    pack_chex3v, retail,       "Chex Quest 3: Vanilla Edition"  },
+    {"chex3d2.wad",   pack_chex3v, commercial,   "Chex Quest 3: Modding Edition"  },
+    {"hacx.wad",      pack_hacx,   commercial,   "HACX: Twitch n' Kill"           },
+    {"rekkrsa.wad",   pack_rekkr,  retail,       "REKKR"                          },
+    {"rekkrsl.wad",   pack_rekkr,  retail,       "REKKR: Sunken Land"             },
 };
 
 static const char *const gamemode_str[] = {

diff --git a/src/d_main.c b/src/d_main.c
@@ -957,7 +957,7 @@ static void InitGameVersion(void)
         // Determine automatically
 
         if (gamemode == shareware || gamemode == registered ||
-            (gamemode == commercial && gamemission == doom2))
+            (gamemode == commercial && (gamemission == doom2 || gamemission == pack_chex3v)))
         {
             // original
             gameversion = exe_doom_1_9;

diff --git a/src/doomdef.h b/src/doomdef.h
@@ -40,6 +40,7 @@ typedef enum {
   pack_chex,    // Chex Quest
   pack_hacx,    // Hacx
   pack_rekkr,   // Rekkr
+  pack_chex3v,  // Chex Quest 3: Vanilla Edition
   none
 } GameMission_t;