diff options
| author | Simon Howard | 2005-10-15 17:57:47 +0000 |
|---|---|---|
| committer | Simon Howard | 2005-10-15 17:57:47 +0000 |
| commit | 5040fc24007e2cbfe754cae4f8253ce48ff34d60 (patch) | |
| tree | 01f9ff619dbeb3f0b93680a64f0d3f90ead12ef8 /src | |
| parent | 72a451c58b46c058187a2ee0ea0dcb855066b197 (diff) | |
| download | chocolate-doom-5040fc24007e2cbfe754cae4f8253ce48ff34d60.tar.gz chocolate-doom-5040fc24007e2cbfe754cae4f8253ce48ff34d60.tar.bz2 chocolate-doom-5040fc24007e2cbfe754cae4f8253ce48ff34d60.zip | |
Add warning message for WADs with FF_START or SS_START in, suggesting
the -merge option.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 200
Diffstat (limited to 'src')
| -rw-r--r-- | src/d_main.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/d_main.c b/src/d_main.c index 9275ed74..2a0d1755 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: d_main.c 198 2005-10-15 17:38:49Z fraggle $ +// $Id: d_main.c 200 2005-10-15 17:57:47Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -22,6 +22,10 @@ // 02111-1307, USA. // // $Log$ +// Revision 1.27 2005/10/15 17:57:47 fraggle +// Add warning message for WADs with FF_START or SS_START in, suggesting +// the -merge option. +// // Revision 1.26 2005/10/15 17:38:49 fraggle // Print startup banners which have been modified by dehacked. // @@ -121,7 +125,7 @@ //----------------------------------------------------------------------------- -static const char rcsid[] = "$Id: d_main.c 198 2005-10-15 17:38:49Z fraggle $"; +static const char rcsid[] = "$Id: d_main.c 200 2005-10-15 17:57:47Z fraggle $"; #define BGCOLOR 7 #define FGCOLOR 8 @@ -1214,7 +1218,7 @@ void D_DoomMain (void) } } #endif - + IdentifyVersion(); // Check for -file in shareware @@ -1297,6 +1301,15 @@ void D_DoomMain (void) else if (M_CheckParm("-nonovert")) novert = false; + if (W_CheckNumForName("SS_START") >= 0 + || W_CheckNumForName("FF_START") >= 0) + { + printf ("===========================================================================\n"); + printf(" WARNING: The loaded WAD file contains modified sprites or\n" + " floor textures. You may want to use the '-merge' command\n" + " line option instead of '-file'.\n"); + } + printf ("===========================================================================\n"); PrintBanner(gamedescription); |