[Prboom-notes] r2977 - trunk/prboom2/src

[<rj...@ma...>]

Author: rjy
Date: Thu Jan  1 00:32:09 2009
New Revision: 2977

Modified:
   trunk/prboom2/src/d_main.h
   trunk/prboom2/src/m_misc.c

Log:
Don't load prboom.wad via autoloading

Currently prboom.wad is loaded by hacking the wad autoloading feature
({wad,deh}_file{1,2} in prboom.cfg) to have effectively a hidden third
option wadfile_3 whose value is always prboom.wad. This has problems:

- By using -noload on the command line, prboom.wad will not be loaded,
  and the game will fail to run at all, with a cryptic error message

- modifiedgame is always true and par times are always suppressed on the
  intermission screen. (cf. prboom-plus r2486)

Modified: trunk/prboom2/src/d_main.h
==============================================================================
--- trunk/prboom2/src/d_main.h	(original)
+++ trunk/prboom2/src/d_main.h	Thu Jan  1 00:32:09 2009
@@ -74,9 +74,7 @@
 void D_AddFile (const char *file, wad_source_t source);
 
 /* cph - MBF-like wad/deh/bex autoload code */
-/* proff 2001/7/1 - added prboom.wad as last entry so it's always loaded and
-   doesn't overlap with the cfg settings */
-#define MAXLOADFILES 3
+#define MAXLOADFILES 2
 extern const char *wad_files[MAXLOADFILES], *deh_files[MAXLOADFILES];
 
 #endif

Modified: trunk/prboom2/src/m_misc.c
==============================================================================
--- trunk/prboom2/src/m_misc.c	(original)
+++ trunk/prboom2/src/m_misc.c	Thu Jan  1 00:32:09 2009
@@ -1013,9 +1013,6 @@
     fclose (f);
     }
   //jff 3/4/98 redundant range checks for hud deleted here
-  /* proff 2001/7/1 - added prboom.wad as last entry so it's always loaded and
-     doesn't overlap with the cfg settings */
-  wad_files[MAXLOADFILES-1]="prboom.wad";
 }