commit bc35d8cbcb47cefe392e7baf8057397137c868bc
Author:     Acts 19 quiz <N/A>
AuthorDate: Sun Jan 23 23:27:23 2022 -0600
Commit:     Acts 19 quiz <N/A>
CommitDate: Sun Jan 23 23:27:23 2022 -0600

    Remove doom2f gameversion.
---
 src/d_mode.h      | 2 +-
 src/doom/d_main.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/d_mode.h b/src/d_mode.h
index df1a9991..a3b627ce 100644
--- a/src/d_mode.h
+++ b/src/d_mode.h
@@ -35,6 +35,7 @@ typedef enum
     heretic,         // Heretic
     hexen,           // Hexen
     strife,          // Strife
+    doom2f,          // Doom 2: L'Enfer sur Terre

     none
 } GameMission_t;
@@ -82,7 +83,6 @@ typedef enum
     freedoom,   // FreeDoom: Phase 1 + 2
     freedm,     // FreeDM
     bfgedition, // Doom Classic (Doom 3: BFG Edition)
-    doom2f,     // Doom II (French)
 } GameVariant_t;

 // Skill level.
diff --git a/src/doom/d_main.c b/src/doom/d_main.c
index 73824b8c..147741fe 100644
--- a/src/doom/d_main.c
+++ b/src/doom/d_main.c
@@ -1241,7 +1241,8 @@ static void LoadIwadDeh(void)
         }
     }

-    if (gamevariant == doom2f)
+    if (gamemission == doom2 && W_CheckNumForName("M_RDTHIS") < 0 && W_CheckNumForName("M_EPISOD") < 0 && W_CheckNumForName("M_EPI1") < 0
+          && W_CheckNumForName("M_EPI2") < 0 && W_CheckNumForName("M_EPI3") < 0 && W_CheckNumForName("WIOSTF") < 0 && W_CheckNumForName("WIOBJ") >= 0)
     {
         char *french_deh = NULL;
         char *dirname;
@@ -1528,11 +1529,6 @@ void D_DoomMain (void)
     {
         gamevariant = bfgedition;
     }
-    else if (gamemission == doom2 && W_CheckNumForName("M_RDTHIS") < 0 && W_CheckNumForName("M_EPISOD") < 0 && W_CheckNumForName("M_EPI1") < 0
-          && W_CheckNumForName("M_EPI2") < 0 && W_CheckNumForName("M_EPI3") < 0 && W_CheckNumForName("WIOSTF") < 0 && W_CheckNumForName("WIOBJ") >= 0)
-    {
-        gamevariant = doom2f;
-    }

     //!
     // @category mod