summaryrefslogtreecommitdiff
path: root/src/d_main.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/d_main.h')
-rw-r--r--src/d_main.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/d_main.h b/src/d_main.h
index c227cddc..9f61ed74 100644
--- a/src/d_main.h
+++ b/src/d_main.h
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: d_main.h 241 2006-01-02 00:17:42Z fraggle $
+// $Id: d_main.h 362 2006-02-03 18:41:26Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,11 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.5 2006/02/03 18:41:26 fraggle
+// Support NWT-style WAD merging (-af and -as command line parameters).
+// Restructure WAD loading so that merged WADs are always loaded before
+// normal PWADs. Remove W_InitMultipleFiles().
+//
// Revision 1.4 2006/01/02 00:17:42 fraggle
// Encapsulate the event queue code properly. Add a D_PopEvent function
// to read a new event from the event queue.
@@ -50,13 +55,6 @@
-#define MAXWADFILES 20
-extern char* wadfiles[MAXWADFILES];
-
-void D_AddFile (char *file);
-
-
-
//
// D_DoomMain()
// Not a globally visible function, just included for source reference,