summaryrefslogtreecommitdiff
path: root/src/doom/d_main.c
diff options
context:
space:
mode:
authorSimon Howard2008-12-03 18:54:36 +0000
committerSimon Howard2008-12-03 18:54:36 +0000
commit27f8ea9f5a210f055f443ef34017dd2412feb326 (patch)
tree86aa08b279f1295b19e30a9bd5cbe1163323351e /src/doom/d_main.c
parent02f2b37c714aa44d82b7e311e03df39430706e69 (diff)
downloadchocolate-doom-27f8ea9f5a210f055f443ef34017dd2412feb326.tar.gz
chocolate-doom-27f8ea9f5a210f055f443ef34017dd2412feb326.tar.bz2
chocolate-doom-27f8ea9f5a210f055f443ef34017dd2412feb326.zip
Centralise the list of IWAD files and use bitmasks to select which
mission types are valid. Subversion-branch: /branches/raven-branch Subversion-revision: 1405
Diffstat (limited to 'src/doom/d_main.c')
-rw-r--r--src/doom/d_main.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/doom/d_main.c b/src/doom/d_main.c
index 91224e88..c8a91e74 100644
--- a/src/doom/d_main.c
+++ b/src/doom/d_main.c
@@ -591,17 +591,6 @@ void D_StartTitle (void)
D_AdvanceDemo ();
}
-static iwad_t iwads[] =
-{
- {"doom2.wad", doom2},
- {"plutonia.wad", pack_plut},
- {"tnt.wad", pack_tnt},
- {"doom.wad", doom},
- {"doom1.wad", doom},
- {"chex.wad", doom},
- {NULL, none},
-};
-
// Strings for dehacked replacements of the startup banner
//
// These are from the original source: some of them are perhaps
@@ -1061,14 +1050,6 @@ void D_DoomMain (void)
M_FindResponseFile ();
- // Undocumented "search for IWADs" parameter used by the setup
- // tool.
-
- if (M_CheckParm("-findiwads") > 0)
- {
- D_FindInstalledIWADs(iwads);
- }
-
// print banner
I_PrintBanner(PACKAGE_STRING);
@@ -1123,7 +1104,7 @@ void D_DoomMain (void)
DEH_Init();
#endif
- iwadfile = D_FindIWAD(iwads, &gamemission);
+ iwadfile = D_FindIWAD(IWAD_MASK_DOOM, &gamemission);
// None found?