Add warning message for WADs with FF_START or SS_START in, suggesting

the -merge option.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 200
This commit is contained in:
Simon Howard 2005-10-15 17:57:47 +00:00
parent 72a451c58b
commit 5040fc2400

View file

@ -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);