shithub: choc

Download patch

ref: bc35d8cbcb47cefe392e7baf8057397137c868bc
parent: 7733f557f29d5ebf5328ff2e46bd3204b9638fb0
author: Acts 19 quiz <N/A>
date: Sun Jan 23 18:27:23 EST 2022 

Remove doom2f gameversion.


--- a/src/d_mode.h
+++ b/src/d_mode.h
@@ -35,6 +35,7 @@
     heretic,         // Heretic
     hexen,           // Hexen
     strife,          // Strife
+    doom2f,          // Doom 2: L'Enfer sur Terre
 
     none
 } GameMission_t;
@@ -82,7 +83,6 @@
     freedoom,   // FreeDoom: Phase 1 + 2
     freedm,     // FreeDM
     bfgedition, // Doom Classic (Doom 3: BFG Edition)
-    doom2f,     // Doom II (French)
 } GameVariant_t;
 
 // Skill level.
--- a/src/doom/d_main.c
+++ b/src/doom/d_main.c
@@ -1241,7 +1241,8 @@
         }
     }
 
-    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;
@@ -1527,11 +1528,6 @@
     else if (W_CheckNumForName("DMENUPIC") >= 0)
     {
         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;
     }
 
     //!