From d0d3b5a6945ece4bd6c8bb1102e8fe55f25852e8 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Fri, 3 Feb 2006 18:41:26 +0000
Subject: 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().

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 362
---
 src/w_merge.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/w_merge.h')

diff --git a/src/w_merge.h b/src/w_merge.h
index 1a7eac47..00f127c5 100644
--- a/src/w_merge.h
+++ b/src/w_merge.h
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: w_merge.h 168 2005-10-08 18:23:18Z fraggle $
+// $Id: w_merge.h 362 2006-02-03 18:41:26Z fraggle $
 //
 // Copyright(C) 2005 Simon Howard
 //
@@ -21,6 +21,11 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.2  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.1  2005/10/08 18:23:18  fraggle
 // WAD merging code
 //
@@ -36,9 +41,16 @@
 #ifndef W_MERGE_H
 #define W_MERGE_H
 
+#define W_NWT_MERGE_SPRITES   0x1
+#define W_NWT_MERGE_FLATS     0x2
+
 // Add a new WAD and merge it into the main directory
 
 void W_MergeFile(char *filename);
 
+// NWT-style merging
+
+void W_NWTMergeFile(char *filename, int flags);
+
 #endif /* #ifndef W_MERGE_H */
 
-- 
cgit v1.2.3