Merge pull request #471 from kraflab/drop-glbsp

Drop glbsp support
kraflab · Jan 11, 2024 · ac22b49 · ac22b49
2 parents 18e1125 + e2fa619
commit ac22b49
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 248 deletions.
diff --git a/prboom2/src/d_main.c b/prboom2/src/d_main.c
@@ -814,7 +814,6 @@ void D_StartTitle (void)
 //         - modified to allocate & use new wadfiles array
 void D_AddFile (const char *file, wad_source_t source)
 {
-  char *gwa_filename=NULL;
   int len;
 
   // There can only be one iwad source!
@@ -839,20 +838,6 @@ void D_AddFile (const char *file, wad_source_t source)
     gamemission = pack_nerve;
 
   numwadfiles++;
-  // proff: automatically try to add the gwa files
-  // proff - moved from w_wad.c
-  gwa_filename=AddDefaultExtension(strcpy(Z_Malloc(strlen(file)+5), file), ".wad");
-  if (dsda_HasFileExt(gwa_filename, ".wad"))
-  {
-    char *ext;
-    ext = &gwa_filename[strlen(gwa_filename)-4];
-    ext[1] = 'g'; ext[2] = 'w'; ext[3] = 'a';
-    wadfiles = Z_Realloc(wadfiles, sizeof(*wadfiles)*(numwadfiles+1));
-    wadfiles[numwadfiles].name = gwa_filename;
-    wadfiles[numwadfiles].src = source_pwad; // Ty 08/29/98
-    wadfiles[numwadfiles].handle = 0;
-    numwadfiles++;
-  }
 }
 
 // killough 10/98: support -dehout filename
@@ -1656,10 +1641,6 @@ static void D_DoomMainSetup(void)
     I_SafeExit(0);
   }
 
-  // figgi 09/18/00-- added switch to force classic bsp nodes
-  if (dsda_Flag(dsda_arg_forceoldbsp))
-    forceOldBsp = true;
-
   DoLooseFiles();  // Ty 08/29/98 - handle "loose" files on command line
 
   IdentifyVersion();

diff --git a/prboom2/src/doomstat.h b/prboom2/src/doomstat.h
@@ -351,6 +351,4 @@ extern int monkeys;
 
 extern int HelperThing;          // type of thing to use for helper
 
-extern dboolean forceOldBsp;
-
 #endif
diff --git a/prboom2/src/dsda/args.c b/prboom2/src/dsda/args.c
@@ -428,11 +428,6 @@ static arg_config_t arg_config[dsda_arg_count] = {
     "reset gamma and exit",
     arg_null,
   },
-  [dsda_arg_forceoldbsp] = {
-    "-forceoldbsp", NULL, NULL,
-    "force classic bsp nodes",
-    arg_null,
-  },
   [dsda_arg_force_old_zdoom_nodes] = {
     "-force_old_zdoom_nodes", NULL, NULL,
     "force extended (non-gl) zdoom nodes",

diff --git a/prboom2/src/dsda/args.h b/prboom2/src/dsda/args.h
@@ -96,7 +96,6 @@ typedef enum {
   dsda_arg_quiet,
   dsda_arg_v,
   dsda_arg_resetgamma,
-  dsda_arg_forceoldbsp,
   dsda_arg_force_old_zdoom_nodes,
   dsda_arg_sigsegv,
   dsda_arg_deathmatch,

diff --git a/prboom2/src/g_game.c b/prboom2/src/g_game.c
@@ -3200,7 +3200,8 @@ byte *G_WriteOptions(byte *demo_p)
       *demo_p++ = comp[i] != 0;
   }
 
-  *demo_p++ = (compatibility_level >= prboom_2_compatibility) && forceOldBsp; // cph 2002/07/20
+  // unused forceOldBsp
+  *demo_p++ = 0;
 
   //----------------
   // Padding at end
@@ -3292,7 +3293,8 @@ const byte *G_ReadOptions(const byte *demo_p)
         comp[i] = *demo_p++;
     }
 
-    forceOldBsp = *demo_p++; // cph 2002/07/20
+    // unused forceOldBsp
+    demo_p++;
   }
   else  /* defaults for versions <= 2.02 */
   {