diff options
| author | Simon Howard | 2006-02-03 18:41:26 +0000 |
|---|---|---|
| committer | Simon Howard | 2006-02-03 18:41:26 +0000 |
| commit | d0d3b5a6945ece4bd6c8bb1102e8fe55f25852e8 (patch) | |
| tree | 3aa0225ccfa6aec2391efa17e81da895b3b664f6 /src/w_merge.h | |
| parent | fd40e07993f83ecb222246d3137949b067c30fce (diff) | |
| download | chocolate-doom-d0d3b5a6945ece4bd6c8bb1102e8fe55f25852e8.tar.gz chocolate-doom-d0d3b5a6945ece4bd6c8bb1102e8fe55f25852e8.tar.bz2 chocolate-doom-d0d3b5a6945ece4bd6c8bb1102e8fe55f25852e8.zip | |
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
Diffstat (limited to 'src/w_merge.h')
| -rw-r--r-- | src/w_merge.h | 14 |
1 files changed, 13 insertions, 1 deletions
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 */ |