diff options
Diffstat (limited to 'src/d_main.c')
-rw-r--r-- | src/d_main.c | 48 |
1 files changed, 37 insertions, 11 deletions
diff --git a/src/d_main.c b/src/d_main.c index cdf5dc35..1d758cca 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -954,8 +954,12 @@ void D_DoomMain (void) { for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p) { - printf(" merging %s\n", myargv[p]); - W_MergeFile(myargv[p]); + char *filename; + + filename = D_TryFindWADByName(myargv[p]); + + printf(" merging %s\n", filename); + W_MergeFile(filename); } } @@ -976,8 +980,12 @@ void D_DoomMain (void) { for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p) { - printf(" performing NWT-style merge of %s\n", myargv[p]); - W_NWTDashMerge(myargv[p]); + char *filename; + + filename = D_TryFindWADByName(myargv[p]); + + printf(" performing NWT-style merge of %s\n", filename); + W_NWTDashMerge(filename); } } @@ -997,8 +1005,12 @@ void D_DoomMain (void) { for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p) { - printf(" merging flats from %s\n", myargv[p]); - W_NWTMergeFile(myargv[p], W_NWT_MERGE_FLATS); + char *filename; + + filename = D_TryFindWADByName(myargv[p]); + + printf(" merging flats from %s\n", filename); + W_NWTMergeFile(filename, W_NWT_MERGE_FLATS); } } @@ -1016,8 +1028,12 @@ void D_DoomMain (void) { for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p) { - printf(" merging sprites from %s\n", myargv[p]); - W_NWTMergeFile(myargv[p], W_NWT_MERGE_SPRITES); + char *filename; + + filename = D_TryFindWADByName(myargv[p]); + + printf(" merging sprites from %s\n", filename); + W_NWTMergeFile(filename, W_NWT_MERGE_SPRITES); } } @@ -1034,8 +1050,12 @@ void D_DoomMain (void) { for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p) { - printf(" merging sprites and flats from %s\n", myargv[p]); - W_NWTMergeFile(myargv[p], W_NWT_MERGE_SPRITES | W_NWT_MERGE_FLATS); + char *filename; + + filename = D_TryFindWADByName(myargv[p]); + + printf(" merging sprites and flats from %s\n", filename); + W_NWTMergeFile(filename, W_NWT_MERGE_SPRITES | W_NWT_MERGE_FLATS); } } @@ -1054,7 +1074,13 @@ void D_DoomMain (void) // until end of parms or another - preceded parm modifiedgame = true; // homebrew levels while (++p != myargc && myargv[p][0] != '-') - D_AddFile (myargv[p]); + { + char *filename; + + filename = D_TryFindWADByName(myargv[p]); + + D_AddFile(filename); + } } // Debug: |